Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

D10.3 #1032

Merged
merged 2 commits into from
Jun 26, 2024
Merged

D10.3 #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb37326
Deprecate 10.1, add 10.4.x-dev.
rosiel Jun 26, 2024
aebefae
Correct permission list.
rosiel Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/build-2.x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,9 @@ jobs:
matrix:
php-versions: ["8.1", "8.2", "8.3"]
test-suite: ["kernel", "functional", "functional-javascript"]
drupal-version: ["10.1.x", "10.2.x", "10.3.x-dev"]
drupal-version: ["10.2.x", "10.3.x", "10.4.x-dev"]
mysql: ["8.0"]
allowed_failure: [false]
exclude:
- php-versions: "8.3"
drupal-version: "10.1.x"


name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} | test-suite ${{ matrix.test-suite }}

Expand Down
2 changes: 1 addition & 1 deletion islandora.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: 'islandora'
description: "Islandora Core"
type: module
package: Islandora
core_version_requirement: ^9 || ^10
core_version_requirement: ^10.2
dependencies:
- context:context_ui
- ctools:ctools
Expand Down
7 changes: 1 addition & 6 deletions tests/src/Functional/DeleteMediaTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,7 @@ class DeleteMediaTest extends IslandoraFunctionalTestBase {
public function setUp(): void {
parent::setUp();

if (version_compare(\Drupal::VERSION, '10.1', '>=')) {
$permissions = ['create media', 'delete any media', 'delete any file'];
}
else {
$permissions = ['create media', 'delete any media'];
}
$permissions = ['create media', 'delete any media', 'delete any file'];

// Create a test user.
$this->account = $this->createUser($permissions);
Expand Down
10 changes: 1 addition & 9 deletions tests/src/Functional/JsonldTypeAlterReactionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,7 @@ public function testMappingReaction() {

// Add the typed predicate we will select in the reaction config.
// Taken from FieldUiTestTrait->fieldUIAddNewField.
if (version_compare(\Drupal::VERSION, '10.2.x-dev', 'lt')) {
$this->submitForm([
'new_storage_type' => 'string',
'label' => 'Typed Predicate',
'field_name' => 'type_predicate',
], 'Save and continue');
$this->submitForm([], 'Save field settings');
}
elseif (version_compare(\Drupal::VERSION, '10.3.x-dev', 'lt')) {
if (version_compare(\Drupal::VERSION, '10.3.x-dev', 'lt')) {
$this->getSession()->getPage()->selectFieldOption('new_storage_type', 'plain_text');
// For Drupal 10.2, we first need to submit the form with the elements
// displayed on initial page load. The form is using AJAX to send a
Expand Down
Loading