Skip to content

Commit

Permalink
Merge branch 'main' into updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joecorall authored Nov 14, 2024
2 parents 9919ada + 0693b06 commit 5f1f189
Show file tree
Hide file tree
Showing 21 changed files with 889 additions and 570 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: [ 8.1, 8.2, 8.3 ]
php-versions: [ 8.2, 8.3 ]

name: PHP ${{ matrix.php-versions }}

Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:

- name: Test site installation
shell: bash
run: composer exec -- drush site:install --existing-config --db-url=sqlite:test_db
run: composer exec -- drush site:install --existing-config --db-url=sqlite://sites/test_db

- name: Inspect configuration
shell: bash
Expand Down
7 changes: 2 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"cweagans/composer-patches": "^1.7",
"discoverygarden/dgi_image_discovery": "^1",
"drupal/admin_toolbar": "^3.1",
"drupal/advanced_search": "^2.0.0@beta",
"drupal/advanced_search": "^2.1",
"drupal/better_exposed_filters": "^6.0",
"drupal/citation_select": "^2.0@beta",
"drupal/coi": "^4.0",
Expand Down Expand Up @@ -60,7 +60,7 @@
"drupal/twig_tweak": "^3.2",
"drupal/views_data_export": "^1.2",
"drupal/views_field_view": "^1.0@beta",
"drush/drush": "^12",
"drush/drush": "^13",
"islandora-rdm/islandora_fits": "dev-8.x-1.x as 1.x-dev",
"islandora/views_nested_details": "^1.0",
"library/pdf.js": "^2.4",
Expand Down Expand Up @@ -130,9 +130,6 @@
},
"drupal/flysystem": {
"required_derivative_scheme https://www.drupal.org/project/flysystem/issues/3457193": "https://www.drupal.org/files/issues/2024-07-01/3378738-1.patch"
},
"drupal/advanced_search": {
"set session": "https://patch-diff.githubusercontent.com/raw/Islandora/advanced_search/pull/52.patch"
}
}
},
Expand Down
Loading

0 comments on commit 5f1f189

Please sign in to comment.