Skip to content

Commit

Permalink
Merge pull request #4 from Islandora/2.x
Browse files Browse the repository at this point in the history
Update for CI.
  • Loading branch information
adam-vessey authored Jul 28, 2022
2 parents 567b958 + 2af105b commit f79386b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 33 deletions.
35 changes: 4 additions & 31 deletions .github/workflows/build-2.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: CI

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the 7.x branch
# Triggers the workflow on push or pull request events but only for the 2.x branch
push:
branches: [ 2.x ]
pull_request:
Expand All @@ -22,37 +22,10 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ["7.3", "7.4"]
drupal-version: ["9.3.x", "9.4.x-dev"]
php-versions: ["7.4", "8.0", "8.1"]
drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev"]
allowed_failure: [false]
mysql: ["5.7"]
# include experimental parts
include:
# 9.3.x on PHP 8.0
- drupal-version: '9.3.x'
php-versions: '8.0'
mysql: "8.0"
allowed_failure: true
# 9.3.x on PHP 8.1
- drupal-version: '9.3.x'
php-versions: '8.1'
mysql: "8.0"
allowed_failure: true
# 9.4.x-dev on PHP "8.0"
- drupal-version: '9.4.x-dev'
php-versions: '8.0'
mysql: "8.0"
allowed_failure: true
# 9.4.x-dev on PHP 8.1
- drupal-version: '9.4.x-dev'
php-versions: '8.1'
mysql: "8.0"
allowed_failure: true
# 10.0.x-dev on PHP 8.1
- drupal-version: '10.0.x-dev'
php-versions: '8.1'
mysql: "8.0"
allowed_failure: true
mysql: ["8.0"]

name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }}
env:
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"require": {
"drupal/token": "^1.3"
},
"conflict": {
"drupal/core": "<=8"
},
"authors": [
{
"name": "Islandora Foundation",
Expand Down
3 changes: 1 addition & 2 deletions openseadragon.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: 'OpenSeadragon Viewer'
type: module
description: 'A light-weight, customizable OpenSeadragon field formatter'
package: Media
core: 8.x
core_version_requirement: ^8 || ^9
core_version_requirement: ^9
dependencies:
- token
configure: openseadragon.admin_settings

0 comments on commit f79386b

Please sign in to comment.