diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml index 57ff6ea..b259270 100644 --- a/.github/workflows/orca.yml +++ b/.github/workflows/orca.yml @@ -19,12 +19,12 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 env: ORCA_SUT_NAME: acquia/drupal-spec-tool ORCA_SUT_BRANCH: master - ORCA_VERSION: ^4 + ORCA_VERSION: ${{ matrix.orca-version }} ORCA_JOB: ${{ matrix.orca-job }} BEHAT: ${{ matrix.behat }} # Google env variables. @@ -35,7 +35,8 @@ jobs: strategy: matrix: orca-job: - - STATIC_CODE_ANALYSIS # Static code analysis. + - STATIC_CODE_ANALYSIS + - ISOLATED_TEST_ON_CURRENT # - INTEGRATED_TEST_ON_OLDEST_SUPPORTED # Integrated test on oldest supported Drupal core version. # - INTEGRATED_TEST_ON_LATEST_LTS # Integrated test on latest LTS Drupal core version. # - INTEGRATED_TEST_ON_PREVIOUS_MINOR # Integrated test on previous minor Drupal core version. @@ -59,25 +60,27 @@ jobs: # - INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR_DEV # - ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_BETA_OR_LATER # Isolated upgrade test to next major beta-or-later Drupal core version. # - ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_DEV # Isolated upgrade test to next major dev Drupal core version. - php-version: [ "8.1" ] + php-version: [ "8.1", "8.3" ] + orca-version: [ "^4" ] include: # Acquia CMS/Spreadsheet/Behat integration test. - # - orca-job: "INTEGRATED_TEST_ON_CURRENT" - # php-version: "8.1" - # behat: "TRUE" - - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV - php-version: "8.1" - - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV - php-version: "8.1" + # - orca-job: "INTEGRATED_TEST_ON_CURRENT" + # php-version: "8.1" + # behat: "TRUE" + + # This version of the Drupal Spec Tool only supports ^10.0.0-alpha1. + # - orca-job: INTEGRATED_TEST_ON_LATEST_EOL_MAJOR + # php-version: "8.1" + - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER - php-version: "8.1" + php-version: "8.3" - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER - php-version: "8.1" - # PHP 8.2 tests. - - orca-job: INTEGRATED_TEST_ON_LATEST_LTS - php-version: "8.2" - - orca-job: ISOLATED_TEST_ON_CURRENT - php-version: "8.2" + php-version: "8.3" + - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV + php-version: "8.3" + - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV + php-version: "8.3" + steps: - uses: actions/checkout@v2 @@ -124,7 +127,7 @@ jobs: all-successful: runs-on: ubuntu-latest - needs: [build] + needs: [ build ] steps: - - name: All checks successful - run: echo "🎉" + - name: All checks successful + run: echo "🎉" diff --git a/composer.json b/composer.json index 5444333..a71d342 100644 --- a/composer.json +++ b/composer.json @@ -19,8 +19,8 @@ "source": "https://github.com/acquia/drupal-spec-tool" }, "require": { - "php": "^8.1|^8.2", - "drupal/core": "^10.0.0-alpha1", + "php": ">=8.1", + "drupal/core": ">=10.0.0-alpha1", "drupal/drupal-extension": "dev-main", "traviscarden/behat-table-comparison": "^0.3" }, diff --git a/docs/README.md b/docs/README.md index 55eb943..91268ed 100644 --- a/docs/README.md +++ b/docs/README.md @@ -9,7 +9,7 @@ This project provides a tool for specifying Drupal architecture details and gene ### Google sheet -Copy [the current Google sheet](https://docs.google.com/spreadsheets/d/1TU_vnglPzM1kiQXOI5jefHB-CpS7ojUGsETLSeOnz_o/edit?usp=sharing) to your Google Drive: +Copy [the current Google sheet](https://docs.google.com/spreadsheets/d/18MALDELw4E5WNFMKz6CUGmIkVde3O4LQC9Loda97XhU/edit?usp=sharing) to your Google Drive: ![Google Sheet Screenshot](images/screenshot.png) diff --git a/docs/images/screenshot.png b/docs/images/screenshot.png index a74d4d0..2ab519d 100644 Binary files a/docs/images/screenshot.png and b/docs/images/screenshot.png differ