Skip to content

Commit

Permalink
Merge pull request #1519 from tripal/tv4g9-issue1455-upgradeDockers
Browse files Browse the repository at this point in the history
Adds a Dockerfile for PHP 8.2 and testing for Drupal 10.1.x
  • Loading branch information
laceysanderson committed May 23, 2023
2 parents 217ec7f + c94371a commit 674fdc0
Show file tree
Hide file tree
Showing 18 changed files with 416 additions and 365 deletions.
25 changes: 14 additions & 11 deletions .github/workflows/ALL-phpunit.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

name: PHPUnit
name: PHPUnit Matrixed
on:
push:
branches-ignore:
Expand All @@ -17,37 +17,40 @@ jobs:
php-version:
- "8.0"
- "8.1"
- "8.2"
pgsql-version:
- "13"
drupal-version:
- "9.4.x-dev"
- "9.5.x-dev"
- "10.0.x-dev"
- "10.1.x-dev"
exclude:
- php-version: "8.2"
pgsql-version: "13"
drupal-version: "9.4.x-dev"
- php-version: "8.2"
pgsql-version: "13"
drupal-version: "9.5.x-dev"
- php-version: "8.0"
pgsql-version: "13"
drupal-version: "10.0.x-dev"
- php-version: "8.0"
pgsql-version: "13"
drupal-version: "10.1.x-dev"

steps:
# Check out the repo
- name: Checkout Repository
uses: actions/checkout@v2
# Here we fully build a docker using the current checked out code
# to ensure we have not broken the install/build process.
- name: Build Dockerfile-php8.1-pgsql13
if: ${{ matrix.php-version == '8.1' && matrix.pgsql-version == '13'}}
run: |
docker build --tag=tripaldocker:localdocker \
--build-arg drupalversion="${{ matrix.drupal-version }}" \
--build-arg chadoschema='testchado' ./ \
--file tripaldocker/Dockerfile-php8.1-pgsql13
- name: Build Dockerfile-php8-pgsql13
if: ${{ matrix.php-version == '8.0' && matrix.pgsql-version == '13'}}
- name: Build Docker Image
run: |
docker build --tag=tripaldocker:localdocker \
--build-arg drupalversion="${{ matrix.drupal-version }}" \
--build-arg chadoschema='testchado' ./ \
--file tripaldocker/Dockerfile-php8-pgsql13
--file tripaldocker/Dockerfile-php${{ matrix.php-version }}-pgsql${{ matrix.pgsql-version}}
# Just spin up docker the good ol' fashion way.
- name: Spin up Local Docker
run: |
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/MAIN-phpunit-php8.0_D9_4x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: PHPUnit
on:
push:
branches:
- 4.x
- tv4g9-issue1455-upgradeDockers
jobs:
running-tests:
name: "Drupal 9.4: PHP 8.0"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Run Automated testing
uses: tripal/test-tripal-action@v1.1
with:
directory-name: 'tripal'
modules: 'tripal tripal_biodb tripal_chado'
php-version: '8.0'
pgsql-version: '13'
drupal-version: '9.4.x-dev'
build-image: true
dockerfile: "UseTripalDockerBackupClause"
23 changes: 23 additions & 0 deletions .github/workflows/MAIN-phpunit-php8.0_D9_5x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: PHPUnit
on:
push:
branches:
- 4.x
- tv4g9-issue1455-upgradeDockers
jobs:
running-tests:
name: "Drupal 9.5: PHP 8.0"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Run Automated testing
uses: tripal/test-tripal-action@v1.1
with:
directory-name: 'tripal'
modules: 'tripal tripal_biodb tripal_chado'
php-version: '8.0'
pgsql-version: '13'
drupal-version: '9.5.x-dev'
build-image: true
dockerfile: "UseTripalDockerBackupClause"
53 changes: 14 additions & 39 deletions .github/workflows/MAIN-phpunit-php8.1_D10_0x.yml
Original file line number Diff line number Diff line change
@@ -1,48 +1,23 @@

name: PHPUnit
on:
push:
branches:
- 4.x

env:
DRUPALVER: 10.0.x-dev

- tv4g9-issue1455-upgradeDockers
jobs:
run-tests:
name: "Drupal 10.0.x-dev (PHP 8.1)"
running-tests:
name: "Drupal 10.0: PHP 8.1"
runs-on: ubuntu-latest
steps:
# Check out the repo
- name: Checkout Repository
uses: actions/checkout@v2
# Here we fully build a docker using the current checked out code
# to ensure we have not broken the install/build process.
- name: Build the Docker
run: |
docker build --tag=tripaldocker:localdocker \
--build-arg drupalversion="$DRUPALVER" \
--build-arg chadoschema="testchado" \
--build-arg composerpackages="" \
--build-arg modules="" \
./ --file tripaldocker/Dockerfile-php8.1-pgsql13
# Just spin up docker the good ol' fashion way.
- name: Spin up Local Docker
run: |
docker run --publish=80:80 --name=tripaldocker -tid \
--volume=`pwd`:/var/www/drupal9/web/modules/contrib/tripal \
tripaldocker:localdocker
docker exec tripaldocker service postgresql restart
# Runs the PHPUnit tests.
- name: Run PHPUnit Tests
env:
SIMPLETEST_BASE_URL: "http://localhost"
SIMPLETEST_DB: "pgsql://drupaladmin:drupal9developmentonlylocal@localhost/sitedb"
BROWSER_OUTPUT_DIRECTORY: "/var/www/drupal9/web/sites/default/files/simpletest"
run: |
docker exec tripaldocker service postgresql restart
docker exec -e SIMPLETEST_BASE_URL=$SIMPLETEST_BASE_URL \
-e SIMPLETEST_DB=$SIMPLETEST_DB \
-e BROWSER_OUTPUT_DIRECTORY=$BROWSER_OUTPUT_DIRECTORY \
--workdir=/var/www/drupal9/web/modules/contrib/tripal \
tripaldocker phpunit
uses: actions/checkout@v3
- name: Run Automated testing
uses: tripal/test-tripal-action@v1.1
with:
directory-name: 'tripal'
modules: 'tripal tripal_biodb tripal_chado'
php-version: '8.1'
pgsql-version: '13'
drupal-version: '10.0.x-dev'
build-image: true
dockerfile: "UseTripalDockerBackupClause"
23 changes: 23 additions & 0 deletions .github/workflows/MAIN-phpunit-php8.1_D10_1x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: PHPUnit
on:
push:
branches:
- 4.x
- tv4g9-issue1455-upgradeDockers
jobs:
running-tests:
name: "Drupal 10.1: PHP 8.1"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Run Automated testing
uses: tripal/test-tripal-action@v1.1
with:
directory-name: 'tripal'
modules: 'tripal tripal_biodb tripal_chado'
php-version: '8.1'
pgsql-version: '13'
drupal-version: '10.1.x-dev'
build-image: true
dockerfile: "UseTripalDockerBackupClause"
46 changes: 0 additions & 46 deletions .github/workflows/MAIN-phpunit-php8.1_D9_3x.yml

This file was deleted.

51 changes: 14 additions & 37 deletions .github/workflows/MAIN-phpunit-php8.1_D9_4x.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,23 @@

name: PHPUnit
on:
push:
branches:
- 4.x

env:
DRUPALVER: 9.4.x-dev

- tv4g9-issue1455-upgradeDockers
jobs:
run-tests:
name: "Drupal 9.4.x-dev (PHP 8.1)"
running-tests:
name: "Drupal 9.4: PHP 8.1"
runs-on: ubuntu-latest
steps:
# Check out the repo
- name: Checkout Repository
uses: actions/checkout@v2
# Here we fully build a docker using the current checked out code
# to ensure we have not broken the install/build process.
- name: Build the Docker
run: |
docker build --tag=tripaldocker:localdocker \
--build-arg drupalversion="$DRUPALVER" \
--build-arg chadoschema='testchado' ./ \
--file tripaldocker/Dockerfile-php8.1-pgsql13
# Just spin up docker the good ol' fashion way.
- name: Spin up Local Docker
run: |
docker run --publish=80:80 --name=tripaldocker -tid \
--volume=`pwd`:/var/www/drupal9/web/modules/contrib/tripal \
tripaldocker:localdocker
docker exec tripaldocker service postgresql restart
# Runs the PHPUnit tests.
- name: Run PHPUnit Tests
env:
SIMPLETEST_BASE_URL: "http://localhost"
SIMPLETEST_DB: "pgsql://drupaladmin:drupal9developmentonlylocal@localhost/sitedb"
BROWSER_OUTPUT_DIRECTORY: "/var/www/drupal9/web/sites/default/files/simpletest"
run: |
docker exec tripaldocker service postgresql restart
docker exec -e SIMPLETEST_BASE_URL=$SIMPLETEST_BASE_URL \
-e SIMPLETEST_DB=$SIMPLETEST_DB \
-e BROWSER_OUTPUT_DIRECTORY=$BROWSER_OUTPUT_DIRECTORY \
--workdir=/var/www/drupal9/web/modules/contrib/tripal \
tripaldocker phpunit
uses: actions/checkout@v3
- name: Run Automated testing
uses: tripal/test-tripal-action@v1.1
with:
directory-name: 'tripal'
modules: 'tripal tripal_biodb tripal_chado'
php-version: '8.1'
pgsql-version: '13'
drupal-version: '9.4.x-dev'
build-image: true
dockerfile: "UseTripalDockerBackupClause"
51 changes: 14 additions & 37 deletions .github/workflows/MAIN-phpunit-php8.1_D9_5x.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,23 @@

name: PHPUnit
on:
push:
branches:
- 4.x

env:
DRUPALVER: 9.5.x-dev

- tv4g9-issue1455-upgradeDockers
jobs:
run-tests:
name: "Drupal 9.5.x-dev (PHP 8.1)"
running-tests:
name: "Drupal 9.5: PHP 8.1"
runs-on: ubuntu-latest
steps:
# Check out the repo
- name: Checkout Repository
uses: actions/checkout@v2
# Here we fully build a docker using the current checked out code
# to ensure we have not broken the install/build process.
- name: Build the Docker
run: |
docker build --tag=tripaldocker:localdocker \
--build-arg drupalversion="$DRUPALVER" \
--build-arg chadoschema='testchado' ./ \
--file tripaldocker/Dockerfile-php8.1-pgsql13
# Just spin up docker the good ol' fashion way.
- name: Spin up Local Docker
run: |
docker run --publish=80:80 --name=tripaldocker -tid \
--volume=`pwd`:/var/www/drupal9/web/modules/contrib/tripal \
tripaldocker:localdocker
docker exec tripaldocker service postgresql restart
# Runs the PHPUnit tests.
- name: Run PHPUnit Tests
env:
SIMPLETEST_BASE_URL: "http://localhost"
SIMPLETEST_DB: "pgsql://drupaladmin:drupal9developmentonlylocal@localhost/sitedb"
BROWSER_OUTPUT_DIRECTORY: "/var/www/drupal9/web/sites/default/files/simpletest"
run: |
docker exec tripaldocker service postgresql restart
docker exec -e SIMPLETEST_BASE_URL=$SIMPLETEST_BASE_URL \
-e SIMPLETEST_DB=$SIMPLETEST_DB \
-e BROWSER_OUTPUT_DIRECTORY=$BROWSER_OUTPUT_DIRECTORY \
--workdir=/var/www/drupal9/web/modules/contrib/tripal \
tripaldocker phpunit
uses: actions/checkout@v3
- name: Run Automated testing
uses: tripal/test-tripal-action@v1.1
with:
directory-name: 'tripal'
modules: 'tripal tripal_biodb tripal_chado'
php-version: '8.1'
pgsql-version: '13'
drupal-version: '9.5.x-dev'
build-image: true
dockerfile: "UseTripalDockerBackupClause"
23 changes: 23 additions & 0 deletions .github/workflows/MAIN-phpunit-php8.2_D10_0x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: PHPUnit
on:
push:
branches:
- 4.x
- tv4g9-issue1455-upgradeDockers
jobs:
running-tests:
name: "Drupal 10.0: PHP 8.2"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Run Automated testing
uses: tripal/test-tripal-action@v1.1
with:
directory-name: 'tripal'
modules: 'tripal tripal_biodb tripal_chado'
php-version: '8.2'
pgsql-version: '13'
drupal-version: '10.0.x-dev'
build-image: true
dockerfile: "UseTripalDockerBackupClause"

0 comments on commit 674fdc0

Please sign in to comment.