From b45b9aec5ac6efc1ea28a26724fb431244f6dd0e Mon Sep 17 00:00:00 2001 From: Jared Whiklo Date: Wed, 15 Dec 2021 12:58:30 -0600 Subject: [PATCH 1/2] Update Github Actions to test more --- .github/workflows/build-2.x.yml | 121 ++++++++++++++++++++++++++++++-- 1 file changed, 115 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index 306278ba6..fb5e25598 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -19,17 +19,124 @@ jobs: build: # The type of runner that the job will run on runs-on: ubuntu-latest + continue-on-error: ${{ matrix.allowed_failure }} strategy: + fail-fast: false matrix: php-versions: ["7.3", "7.4"] test-suite: ["kernel", "functional", "functional-javascript"] - drupal-version: ["8.9.11", "9.1.5"] - - name: PHP ${{ matrix.php-versions }} drupal ${{ matrix.drupal-version }} test-suite ${{ matrix.test-suite }} + drupal-version: ["9.3.x", "9.4.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" + test-suite: "kernel" + allowed_failure: true + - drupal-version: '9.3.x' + php-versions: '8.0' + mysql: "8.0" + test-suite: "functional" + allowed_failure: true + - drupal-version: '9.3.x' + php-versions: '8.0' + mysql: "8.0" + test-suite: "functional-javascript" + allowed_failure: true + # 9.3.x on PHP 8.1 + - drupal-version: '9.3.x' + php-versions: '8.1' + mysql: "8.0" + test-suite: "kernel" + allowed_failure: true + - drupal-version: '9.3.x' + php-versions: '8.1' + mysql: "8.0" + test-suite: "functional" + allowed_failure: true + - drupal-version: '9.3.x' + php-versions: '8.1' + mysql: "8.0" + test-suite: "functional-javascript" + allowed_failure: true + # 9.4.x-dev on PHP "8.0" + - drupal-version: '9.4.x-dev' + php-versions: '8.0' + mysql: "8.0" + test-suite: "kernel" + allowed_failure: true + - drupal-version: '9.4.x-dev' + php-versions: '8.0' + mysql: "8.0" + test-suite: "functional" + allowed_failure: true + - drupal-version: '9.4.x-dev' + php-versions: '8.0' + mysql: "8.0" + test-suite: "functional-javascript" + allowed_failure: true + - drupal-version: '10.0.x-dev' + php-versions: '8.0' + mysql: "8.0" + test-suite: "kernel" + allowed_failure: true + # 9.4.x-dev on PHP 8.1 + - drupal-version: '9.4.x-dev' + php-versions: '8.1' + mysql: "8.0" + test-suite: "kernel" + allowed_failure: true + - drupal-version: '9.4.x-dev' + php-versions: '8.1' + mysql: "8.0" + test-suite: "functional" + allowed_failure: true + - drupal-version: '9.4.x-dev' + php-versions: '8.1' + mysql: "8.0" + test-suite: "functional-javascript" + allowed_failure: true + # 10.0.x-dev on PHP 8.0 + - drupal-version: '10.0.x-dev' + php-versions: '8.0' + mysql: "8.0" + test-suite: "kernel" + allowed_failure: true + - drupal-version: '10.0.x-dev' + php-versions: '8.0' + mysql: "8.0" + test-suite: "functional" + allowed_failure: true + - drupal-version: '10.0.x-dev' + php-versions: '8.0' + mysql: "8.0" + test-suite: "functional-javascript" + allowed_failure: true + # 10.0.x-dev on PHP 8.1 + - drupal-version: '10.0.x-dev' + php-versions: '8.1' + mysql: "8.0" + test-suite: "kernel" + allowed_failure: true + - drupal-version: '10.0.x-dev' + php-versions: '8.1' + mysql: "8.0" + test-suite: "functional" + allowed_failure: true + - drupal-version: '10.0.x-dev' + php-versions: '8.1' + mysql: "8.0" + test-suite: "functional-javascript" + allowed_failure: true + + name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} | test-suite ${{ matrix.test-suite }} services: mysql: - image: mysql:5.7 + image: mysql:${{ matrix.mysql }} env: MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_DATABASE: drupal @@ -44,6 +151,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Checkout code uses: actions/checkout@v2 @@ -53,8 +161,8 @@ jobs: - name: Checkout islandora_ci uses: actions/checkout@v2 with: - repository: islandora/islandora_ci - ref: github-actions + repository: whikloj/islandora_ci + ref: fix-things path: islandora_ci - name: Setup PHP @@ -66,6 +174,7 @@ jobs: - name: Setup Mysql client run: | sudo apt-get update + sudo apt-get remove -y mysql-client mysql-common sudo apt-get install -y mysql-client - name: Set environment variables From bbda6cf55086cd7ce72df4750114f50e3c72aada Mon Sep 17 00:00:00 2001 From: Jared Whiklo Date: Fri, 14 Jan 2022 11:15:00 -0600 Subject: [PATCH 2/2] Switch back to islandora --- .github/workflows/build-2.x.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml index fb5e25598..ad11dca8a 100644 --- a/.github/workflows/build-2.x.yml +++ b/.github/workflows/build-2.x.yml @@ -161,8 +161,8 @@ jobs: - name: Checkout islandora_ci uses: actions/checkout@v2 with: - repository: whikloj/islandora_ci - ref: fix-things + repository: islandora/islandora_ci + ref: github-actions path: islandora_ci - name: Setup PHP