Skip to content

Commit

Permalink
ACMS-4353: Update GitHub Workflow for Acquia CMS Compatibility Testin…
Browse files Browse the repository at this point in the history
…g with ORCA 5 and PHP 8.4.
  • Loading branch information
rajeshreeputra committed Nov 27, 2024
1 parent a350b83 commit c138ffc
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 16 deletions.
30 changes: 21 additions & 9 deletions .github/workflows/acquia_cms_ci.workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
# Provide your package's name.
ORCA_SUT_NAME: acquia/acquia_cms
ORCA_SUT_BRANCH: develop
ORCA_VERSION: ^4
ORCA_VERSION: ^5
ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml
ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project
ORCA_ENABLE_NIGHTWATCH: "FALSE"
Expand All @@ -37,7 +37,9 @@ jobs:
orca-job:
- STATIC_CODE_ANALYSIS
#- STRICT_DEPRECATED_CODE_SCAN
#php-version: [ "8.1" ]
php-version:
- 8.3
- 8.4
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.x
Expand All @@ -46,7 +48,7 @@ jobs:
node-version: 20.x
- uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: ${{ matrix.php-version }}
#coverage: xdebug
- name: Download ORCA
run: |
Expand Down Expand Up @@ -76,6 +78,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php-version:
- 8.3
- 8.4
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.x
Expand All @@ -84,7 +90,7 @@ jobs:
node-version: 20.x
- uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: ${{ matrix.php-version }}
#coverage: xdebug
- name: Execute PHPStan
run: |
Expand All @@ -93,7 +99,7 @@ jobs:
./vendor/bin/phpstan analyze
integrated_tests:
if: ${{ github.event_name == 'pull_request' }}
name: ${{ matrix.acms_job }} (${{ matrix.orca-job }})
name: ${{ matrix.acms_job }} (${{ matrix.orca-job }}) (${{ matrix.php-version }})
runs-on: ubuntu-24.04
env:
# Site test artifacts.
Expand Down Expand Up @@ -131,6 +137,9 @@ jobs:
acms_job:
- integrated_php_unit_tests
- integrated_existing_site_tests
php-version:
- 8.3
- 8.4
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.x
Expand All @@ -139,7 +148,7 @@ jobs:
node-version: 20.x
- uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: ${{ matrix.php-version }}
#coverage: xdebug
- name: Setup MySQL
run: |
Expand Down Expand Up @@ -192,7 +201,7 @@ jobs:
../orca/bin/ci/after_script.sh
isolated_tests:
if: ${{ github.event_name == 'pull_request' }}
name: acquia_cms (${{ matrix.modules }}) on (${{ matrix.orca-job }})
name: acquia_cms (${{ matrix.modules }}) on (${{ matrix.orca-job }}) (${{ matrix.php-version }})
runs-on: ubuntu-24.04
env:
# Set ORCA related environment variables.
Expand Down Expand Up @@ -240,6 +249,9 @@ jobs:
- acquia_cms_site_studio
- acquia_cms_tour
- acquia_cms_video
php-version:
- 8.3
- 8.4
steps:
- uses: actions/checkout@v3
- name: Use Node.js 12.13.1
Expand All @@ -248,7 +260,7 @@ jobs:
node-version: 12.13.1
- uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: ${{ matrix.php-version }}
#coverage: xdebug
- name: Download ORCA
run: |
Expand Down Expand Up @@ -423,7 +435,7 @@ jobs:
# node-version: 20.x
# - uses: shivammathur/setup-php@v2
# with:
# php-version: 8.3
# php-version: 8.4
# #coverage: xdebug
# - name: Setup MySQL
# run: |
Expand Down
27 changes: 20 additions & 7 deletions .github/workflows/acquia_cms_cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
# Provide your package's name.
ORCA_SUT_NAME: acquia/acquia_cms
ORCA_SUT_BRANCH: develop
ORCA_VERSION: ^4
ORCA_VERSION: ^5
ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml
ORCA_ENABLE_NIGHTWATCH: "FALSE"
ORCA_PHPCS_STANDARD: AcquiaPHP
Expand All @@ -35,6 +35,9 @@ jobs:
orca-job:
- STATIC_CODE_ANALYSIS
- STRICT_DEPRECATED_CODE_SCAN
php-version:
- 8.3
- 8.4
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.x
Expand All @@ -43,7 +46,7 @@ jobs:
node-version: 20.x
- uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: ${{ matrix.php-version }}
#coverage: xdebug
- name: Download ORCA
run: |
Expand All @@ -67,7 +70,7 @@ jobs:
../orca/bin/ci/after_failure.sh
../orca/bin/ci/after_script.sh
integrated_tests:
name: ${{ matrix.acms_job }} (${{ matrix.orca-job }})
name: ${{ matrix.acms_job }} (${{ matrix.orca-job }}) (${{ matrix.php-version }})
runs-on: ubuntu-latest
env:
ORCA_JOB: ${{ matrix.orca-job }}
Expand All @@ -82,6 +85,9 @@ jobs:
- integrated_php_unit_tests
- integrated_existing_site_tests
- backstop_tests
php-version:
- 8.3
- 8.4
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.x
Expand All @@ -90,7 +96,7 @@ jobs:
node-version: 20.x
- uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: ${{ matrix.php-version }}
- name: Setup MySQL
run: |
sudo /etc/init.d/mysql start
Expand Down Expand Up @@ -143,7 +149,7 @@ jobs:
../orca/bin/ci/after_failure.sh
../orca/bin/ci/after_script.sh
isolated_tests:
name: acquia_cms (${{ matrix.orca-job }})
name: acquia_cms (${{ matrix.orca-job }}) (${{ matrix.php-version }})
runs-on: ubuntu-latest
env:
# Set ORCA related environment variables.
Expand All @@ -161,7 +167,10 @@ jobs:
php-version:
- 8.1
- 8.3
- 8.4
exclude:
- php-version: 8.4
orca-job: INTEGRATED_TEST_ON_LATEST_LTS
- php-version: 8.3
orca-job: INTEGRATED_TEST_ON_LATEST_LTS
- php-version: 8.1
Expand Down Expand Up @@ -292,6 +301,7 @@ jobs:
- INTEGRATED_TEST_ON_PREVIOUS_MINOR
php-version:
- 8.3
- 8.4
# exclude:
# - php-version: 8.3
# orca-job: INTEGRATED_TEST_ON_PREVIOUS_MINOR
Expand Down Expand Up @@ -341,7 +351,7 @@ jobs:
../orca/bin/ci/after_failure.sh
../orca/bin/ci/after_script.sh
dev_version_test:
name: ${{ matrix.acms_job }} (${{ matrix.modules }})
name: ${{ matrix.acms_job }} (${{ matrix.modules }}) (${{ matrix.php-version }})
runs-on: ubuntu-latest
env:
ORCA_SUT_NAME: acquia/acquia_cms
Expand Down Expand Up @@ -385,6 +395,9 @@ jobs:
- acquia_cms_site_studio
- acquia_cms_tour
- acquia_cms_video
php-version:
- 8.3
- 8.4
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.x
Expand All @@ -393,7 +406,7 @@ jobs:
node-version: 20.x
- uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: ${{ matrix.php-version }}
- name: Setup MySQL
run: |
sudo /etc/init.d/mysql start
Expand Down

0 comments on commit c138ffc

Please sign in to comment.