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

G5.125 support d11 #126

Merged
merged 8 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
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
4 changes: 2 additions & 2 deletions .devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"drupalversion": "10.4.x-dev",
"drupalversion": "11.1.x-dev",
"phpversion": "8.3",
"pgsqlversion": "16"
}
},
"initializeCommand": "docker pull knowpulse/tripalcultivate:baseonly-drupal10.4.x-dev-php8.3-pgsql16",
"initializeCommand": "docker pull knowpulse/tripalcultivate-base:drupal11.1.x-dev-php8.3-pgsql16",
"workspaceMount": "source=${localWorkspaceFolder},target=/var/www/drupal/web/modules/contrib/TripalCultivate-Phenotypes,type=bind",
"workspaceFolder": "/var/www/drupal/web/modules/contrib/TripalCultivate-Phenotypes",
"customizations": {
Expand Down
19 changes: 18 additions & 1 deletion .github/workflows/ALL-PHPUnit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,26 @@ jobs:
- "13"
- "16"
drupal-version:
- "10.2.x-dev"
- "10.3.x-dev"
- "10.4.x-dev"
- "10.5.x-dev"
- "11.0.x-dev"
- "11.1.x-dev"
exclude:
- php-version: "8.1"
drupal-version: "11.0.x-dev"
- php-version: "8.2"
drupal-version: "11.0.x-dev"
- php-version: "8.3"
pgsql-version: "13"
drupal-version: "11.0.x-dev"
- php-version: "8.1"
drupal-version: "11.1.x-dev"
- php-version: "8.2"
drupal-version: "11.1.x-dev"
- php-version: "8.3"
pgsql-version: "13"
drupal-version: "11.1.x-dev"

steps:
# Check out the repo
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/MAIN-phpunit-Grid1A.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ on:

## UPDATES
## Update the version numbers in the job name and the action parameters
# |-------------|-----------------|-----------------|-----------------|
# | Drupal | 10.2.x | 10.3.x | 10.4.x |
# |-------------|-----------------|-----------------|-----------------|
# | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] |
# | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] |
# | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] |
## | Drupal | 10.3.x | 10.4.x | 10.5.x | 11.0.x | 11.1.x |
## |-------------|-----------------|-----------------|-----------------|-----------------|-----------------|
## | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] | | |
## | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] | | |
## | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] | ![Grid4C-Badge] | ![Grid5C-Badge] |

jobs:
grid-1A:
name: "Drupal 10.2.x-dev - PHP 8.1 - PostgreSQL 16"
name: "Drupal 10.3.x-dev - PHP 8.1 - PostgreSQL 16"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand All @@ -29,4 +28,4 @@ jobs:
dockerfile: 'Dockerfile'
php-version: 8.1
pgsql-version: 16
drupal-version: 10.2.x-dev
drupal-version: 10.3.x-dev
15 changes: 7 additions & 8 deletions .github/workflows/MAIN-phpunit-Grid1B.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ on:

## UPDATES
## Update the version numbers in the job name and the action parameters
# |-------------|-----------------|-----------------|-----------------|
# | Drupal | 10.2.x | 10.3.x | 10.4.x |
# |-------------|-----------------|-----------------|-----------------|
# | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] |
# | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] |
# | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] |
## | Drupal | 10.3.x | 10.4.x | 10.5.x | 11.0.x | 11.1.x |
## |-------------|-----------------|-----------------|-----------------|-----------------|-----------------|
## | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] | | |
## | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] | | |
## | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] | ![Grid4C-Badge] | ![Grid5C-Badge] |

jobs:
grid-1B:
name: "Drupal 10.2.x-dev - PHP 8.2 - PostgreSQL 16"
name: "Drupal 10.3.x-dev - PHP 8.2 - PostgreSQL 16"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand All @@ -29,4 +28,4 @@ jobs:
dockerfile: 'Dockerfile'
php-version: 8.2
pgsql-version: 16
drupal-version: 10.2.x-dev
drupal-version: 10.3.x-dev
15 changes: 7 additions & 8 deletions .github/workflows/MAIN-phpunit-Grid1C.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ on:

## UPDATES
## Update the version numbers in the job name and the action parameters
# |-------------|-----------------|-----------------|-----------------|
# | Drupal | 10.2.x | 10.3.x | 10.4.x |
# |-------------|-----------------|-----------------|-----------------|
# | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] |
# | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] |
# | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] |
## | Drupal | 10.3.x | 10.4.x | 10.5.x | 11.0.x | 11.1.x |
## |-------------|-----------------|-----------------|-----------------|-----------------|-----------------|
## | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] | | |
## | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] | | |
## | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] | ![Grid4C-Badge] | ![Grid5C-Badge] |

jobs:
grid-1C:
name: "Drupal 10.2.x-dev - PHP 8.3 - PostgreSQL 16"
name: "Drupal 10.3.x-dev - PHP 8.3 - PostgreSQL 16"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand All @@ -29,4 +28,4 @@ jobs:
dockerfile: 'Dockerfile'
php-version: 8.3
pgsql-version: 16
drupal-version: 10.2.x-dev
drupal-version: 10.3.x-dev
15 changes: 7 additions & 8 deletions .github/workflows/MAIN-phpunit-Grid2A.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ on:

## UPDATES
## Update the version numbers in the job name and the action parameters
# |-------------|-----------------|-----------------|-----------------|
# | Drupal | 10.2.x | 10.3.x | 10.4.x |
# |-------------|-----------------|-----------------|-----------------|
# | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] |
# | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] |
# | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] |
## | Drupal | 10.3.x | 10.4.x | 10.5.x | 11.0.x | 11.1.x |
## |-------------|-----------------|-----------------|-----------------|-----------------|-----------------|
## | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] | | |
## | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] | | |
## | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] | ![Grid4C-Badge] | ![Grid5C-Badge] |

jobs:
grid-2A:
name: "Drupal 10.3.x-dev - PHP 8.1 - PostgreSQL 16"
name: "Drupal 10.4.x-dev - PHP 8.1 - PostgreSQL 16"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand All @@ -29,4 +28,4 @@ jobs:
dockerfile: 'Dockerfile'
php-version: 8.1
pgsql-version: 16
drupal-version: 10.3.x-dev
drupal-version: 10.4.x-dev
15 changes: 7 additions & 8 deletions .github/workflows/MAIN-phpunit-Grid2B.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ on:

## UPDATES
## Update the version numbers in the job name and the action parameters
# |-------------|-----------------|-----------------|-----------------|
# | Drupal | 10.2.x | 10.3.x | 10.4.x |
# |-------------|-----------------|-----------------|-----------------|
# | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] |
# | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] |
# | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] |
## | Drupal | 10.3.x | 10.4.x | 10.5.x | 11.0.x | 11.1.x |
## |-------------|-----------------|-----------------|-----------------|-----------------|-----------------|
## | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] | | |
## | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] | | |
## | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] | ![Grid4C-Badge] | ![Grid5C-Badge] |

jobs:
grid-2B:
name: "Drupal 10.3.x-dev - PHP 8.2 - PostgreSQL 16"
name: "Drupal 10.4.x-dev - PHP 8.2 - PostgreSQL 16"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand All @@ -29,4 +28,4 @@ jobs:
dockerfile: 'Dockerfile'
php-version: 8.2
pgsql-version: 16
drupal-version: 10.3.x-dev
drupal-version: 10.4.x-dev
15 changes: 7 additions & 8 deletions .github/workflows/MAIN-phpunit-Grid2C.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ on:

## UPDATES
## Update the version numbers in the job name and the action parameters
# |-------------|-----------------|-----------------|-----------------|
# | Drupal | 10.2.x | 10.3.x | 10.4.x |
# |-------------|-----------------|-----------------|-----------------|
# | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] |
# | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] |
# | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] |
## | Drupal | 10.3.x | 10.4.x | 10.5.x | 11.0.x | 11.1.x |
## |-------------|-----------------|-----------------|-----------------|-----------------|-----------------|
## | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] | | |
## | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] | | |
## | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] | ![Grid4C-Badge] | ![Grid5C-Badge] |

jobs:
grid-2C:
name: "Drupal 10.3.x-dev - PHP 8.3 - PostgreSQL 16"
name: "Drupal 10.4.x-dev - PHP 8.3 - PostgreSQL 16"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand All @@ -29,4 +28,4 @@ jobs:
dockerfile: 'Dockerfile'
php-version: 8.3
pgsql-version: 16
drupal-version: 10.3.x-dev
drupal-version: 10.4.x-dev
15 changes: 7 additions & 8 deletions .github/workflows/MAIN-phpunit-Grid3A.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ on:

## UPDATES
## Update the version numbers in the job name and the action parameters
# |-------------|-----------------|-----------------|-----------------|
# | Drupal | 10.2.x | 10.3.x | 10.4.x |
# |-------------|-----------------|-----------------|-----------------|
# | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] |
# | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] |
# | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] |
## | Drupal | 10.3.x | 10.4.x | 10.5.x | 11.0.x | 11.1.x |
## |-------------|-----------------|-----------------|-----------------|-----------------|-----------------|
## | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] | | |
## | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] | | |
## | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] | ![Grid4C-Badge] | ![Grid5C-Badge] |

jobs:
grid-3A:
name: "Drupal 10.4.x-dev - PHP 8.1 - PostgreSQL 16"
name: "Drupal 10.5.x-dev - PHP 8.1 - PostgreSQL 16"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand All @@ -29,4 +28,4 @@ jobs:
dockerfile: 'Dockerfile'
php-version: 8.1
pgsql-version: 16
drupal-version: 10.4.x-dev
drupal-version: 10.5.x-dev
15 changes: 7 additions & 8 deletions .github/workflows/MAIN-phpunit-Grid3B.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ on:

## UPDATES
## Update the version numbers in the job name and the action parameters
# |-------------|-----------------|-----------------|-----------------|
# | Drupal | 10.2.x | 10.3.x | 10.4.x |
# |-------------|-----------------|-----------------|-----------------|
# | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] |
# | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] |
# | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] |
## | Drupal | 10.3.x | 10.4.x | 10.5.x | 11.0.x | 11.1.x |
## |-------------|-----------------|-----------------|-----------------|-----------------|-----------------|
## | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] | | |
## | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] | | |
## | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] | ![Grid4C-Badge] | ![Grid5C-Badge] |

jobs:
grid-3B:
name: "Drupal 10.4.x-dev - PHP 8.2 - PostgreSQL 16"
name: "Drupal 10.5.x-dev - PHP 8.2 - PostgreSQL 16"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand All @@ -29,4 +28,4 @@ jobs:
dockerfile: 'Dockerfile'
php-version: 8.2
pgsql-version: 16
drupal-version: 10.4.x-dev
drupal-version: 10.5.x-dev
15 changes: 7 additions & 8 deletions .github/workflows/MAIN-phpunit-Grid3C.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ on:

## UPDATES
## Update the version numbers in the job name and the action parameters
# |-------------|-----------------|-----------------|-----------------|
# | Drupal | 10.2.x | 10.3.x | 10.4.x |
# |-------------|-----------------|-----------------|-----------------|
# | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] |
# | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] |
# | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] |
## | Drupal | 10.3.x | 10.4.x | 10.5.x | 11.0.x | 11.1.x |
## |-------------|-----------------|-----------------|-----------------|-----------------|-----------------|
## | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] | | |
## | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] | | |
## | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] | ![Grid4C-Badge] | ![Grid5C-Badge] |

jobs:
grid-3C:
name: "Drupal 10.4.x-dev - PHP 8.3 - PostgreSQL 16"
name: "Drupal 10.5.x-dev - PHP 8.3 - PostgreSQL 16"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand All @@ -29,4 +28,4 @@ jobs:
dockerfile: 'Dockerfile'
php-version: 8.3
pgsql-version: 16
drupal-version: 10.4.x-dev
drupal-version: 10.5.x-dev
31 changes: 31 additions & 0 deletions .github/workflows/MAIN-phpunit-Grid4C.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: PHPUnit
on:
push:
branches:
- 4.x

## UPDATES
## Update the version numbers in the job name and the action parameters
## | Drupal | 10.3.x | 10.4.x | 10.5.x | 11.0.x | 11.1.x |
## |-------------|-----------------|-----------------|-----------------|-----------------|-----------------|
## | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] | | |
## | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] | | |
## | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] | ![Grid4C-Badge] | ![Grid5C-Badge] |

jobs:
grid-4C:
name: "Drupal 11.0.x-dev - PHP 8.3 - PostgreSQL 16"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Run Automated testing
uses: tripal/test-tripal-action@v1.6
with:
directory-name: 'TripalCultivate-Phenotypes'
modules: 'trpcultivate_phenotypes trpcultivate_phenocollect trpcultivate_phenoshare'
build-image: TRUE
dockerfile: 'Dockerfile'
php-version: 8.3
pgsql-version: 16
drupal-version: 11.0.x-dev
31 changes: 31 additions & 0 deletions .github/workflows/MAIN-phpunit-Grid5C.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: PHPUnit
on:
push:
branches:
- 4.x

## UPDATES
## Update the version numbers in the job name and the action parameters
## | Drupal | 10.3.x | 10.4.x | 10.5.x | 11.0.x | 11.1.x |
## |-------------|-----------------|-----------------|-----------------|-----------------|-----------------|
## | **PHP 8.1** | ![Grid1A-Badge] | ![Grid2A-Badge] | ![Grid3A-Badge] | | |
## | **PHP 8.2** | ![Grid1B-Badge] | ![Grid2B-Badge] | ![Grid3B-Badge] | | |
## | **PHP 8.3** | ![Grid1C-Badge] | ![Grid2C-Badge] | ![Grid3C-Badge] | ![Grid4C-Badge] | ![Grid5C-Badge] |

jobs:
grid-5C:
name: "Drupal 11.1.x-dev - PHP 8.3 - PostgreSQL 16"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Run Automated testing
uses: tripal/test-tripal-action@v1.6
with:
directory-name: 'TripalCultivate-Phenotypes'
modules: 'trpcultivate_phenotypes trpcultivate_phenocollect trpcultivate_phenoshare'
build-image: TRUE
dockerfile: 'Dockerfile'
php-version: 8.3
pgsql-version: 16
drupal-version: 11.1.x-dev
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG drupalversion=10.3.x-dev
ARG drupalversion=11.1.x-dev
ARG phpversion=8.3
ARG pgsqlversion=16
FROM knowpulse/tripalcultivate:baseonly-drupal${drupalversion}-php${phpversion}-pgsql${pgsqlversion}
FROM knowpulse/tripalcultivate-base:drupal${drupalversion}-php${phpversion}-pgsql${pgsqlversion}

COPY . /var/www/drupal/web/modules/contrib/TripalCultivate-Phenotypes
WORKDIR /var/www/drupal/web/modules/contrib/TripalCultivate-Phenotypes
Expand Down
Loading