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.

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

Removing support of D9 and PHP 8.0 #480

Merged
merged 3 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
17 changes: 5 additions & 12 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,14 @@ jobs:
fail-fast: false
matrix:
php-version:
- "8.0"
- "8.1"
- "8.2"
drupal-core:
# Should update the following as the minimum supported version from Drupal.org
- "9.5.x"
- "10.1.x"
instance-type:
- "Edge"
- "X"
exclude:
- php-version: "8.2"
drupal-core: "9.5.x"
- php-version: "8.0"
drupal-core: "10.1.x"

steps:

Expand Down Expand Up @@ -77,14 +70,14 @@ jobs:
echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composercache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Checkout apigee_m10n module
uses: actions/checkout@v3.0.0
uses: actions/checkout@v3
with:
path: drupal/modules/contrib/apigee_m10n

Expand Down Expand Up @@ -143,13 +136,13 @@ jobs:
sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional

- name: "Run PHPUnit tests"
if: ${{ matrix.drupal-core != '9.5.x' || matrix.php-version != '8.1' }}
if: ${{ matrix.drupal-core != '10.1.x' || matrix.php-version != '8.1' }}
run: |
cd drupal
vendor/bin/phpunit -c core --verbose --color --group apigee_m10n --testsuite unit,kernel,functional,functional-javascript modules/contrib/apigee_m10n

- name: "Run PHPUnit tests with Code Coverage"
if: ${{ matrix.drupal-core == '9.5.x' && matrix.php-version == '8.1' }}
if: ${{ matrix.drupal-core == '10.1.x' && matrix.php-version == '8.1' }}
run: |
cd drupal
cp modules/contrib/apigee_m10n/phpunit.core.xml.dist core/phpunit.xml
Expand All @@ -163,7 +156,7 @@ jobs:
path: drupal/sites/simpletest/browser_output/*

- name: Upload coverage to Codecov
if: ${{ matrix.drupal-core == '9.5.x' && matrix.php-version == '8.1' }}
if: ${{ matrix.drupal-core == '10.1.x' && matrix.php-version == '8.1' }}
uses: codecov/codecov-action@v3
with:
files: /tmp/coverage_${{ matrix.instance-type }}.xml
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"type": "drupal-module",
"description": "Apigee Edge Monetization for Drupal",
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0",
"ext-bcmath": "*",
"cweagans/composer-patches": "~1.6",
"commerceguys/intl": "~1.0 || ^2.0",
"drupal/apigee_edge": "^2.0.2 || ^3.0.0",
"drupal/core": "^9.5 || ^10.1",
"commerceguys/intl": "^2.0",
"drupal/apigee_edge": "^3.0.0",
"drupal/core": "^10.1",
"drupal/requirement": "^1.2",
"drupal/jquery_ui_dialog": "^2.0",
"apigee/apigee-client-php": "^2.0.16 || ^3.0.0"
"apigee/apigee-client-php": "^3.0.0"
},
"require-dev": {
"apigee/apigee-mock-client-php": "^1.1.1",
"drupal/drupal-extension": "^4.2.1 || ~5",
"drupal/core-dev": "^9.5 || ^10.1",
"drupal/drupal-extension": "~5",
"drupal/core-dev": "^10.1",
"drush/drush": "^11.5",
"mglaman/drupal-check": "^1.3",
"phpmd/phpmd": "^2.8.2",
Expand Down
Loading