Merge pull request #126 from TripalCultivate/g5.125-supportD11

G5.125 support d11
TripalCultivate · Nov 22, 2024 · 3b884bd · 3b884bd
2 parents c510bf2 + bdbe881
commit 3b884bd
Show file tree

Hide file tree

Showing 22 changed files with 309 additions and 235 deletions.
diff --git a/.devcontainer.json b/.devcontainer.json
@@ -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": {

diff --git a/.github/workflows/ALL-PHPUnit.yml b/.github/workflows/ALL-PHPUnit.yml
@@ -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

diff --git a/.github/workflows/MAIN-phpunit-Grid1A.yml b/.github/workflows/MAIN-phpunit-Grid1A.yml
@@ -3,19 +3,19 @@ on:
   push:
     branches:
       - 4.x
+      - g5.125-supportD11
 
 ## 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
@@ -29,4 +29,4 @@ jobs:
           dockerfile: 'Dockerfile'
           php-version: 8.1
           pgsql-version: 16
-          drupal-version: 10.2.x-dev
+          drupal-version: 10.3.x-dev
diff --git a/.github/workflows/MAIN-phpunit-Grid1B.yml b/.github/workflows/MAIN-phpunit-Grid1B.yml
@@ -3,19 +3,19 @@ on:
   push:
     branches:
       - 4.x
+      - g5.125-supportD11
 
 ## 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
@@ -29,4 +29,4 @@ jobs:
           dockerfile: 'Dockerfile'
           php-version: 8.2
           pgsql-version: 16
-          drupal-version: 10.2.x-dev
+          drupal-version: 10.3.x-dev
diff --git a/.github/workflows/MAIN-phpunit-Grid1C.yml b/.github/workflows/MAIN-phpunit-Grid1C.yml
@@ -3,19 +3,19 @@ on:
   push:
     branches:
       - 4.x
+      - g5.125-supportD11
 
 ## 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
@@ -29,4 +29,4 @@ jobs:
           dockerfile: 'Dockerfile'
           php-version: 8.3
           pgsql-version: 16
-          drupal-version: 10.2.x-dev
+          drupal-version: 10.3.x-dev
diff --git a/.github/workflows/MAIN-phpunit-Grid2A.yml b/.github/workflows/MAIN-phpunit-Grid2A.yml
@@ -3,19 +3,19 @@ on:
   push:
     branches:
       - 4.x
+      - g5.125-supportD11
 
 ## 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
@@ -29,4 +29,4 @@ jobs:
           dockerfile: 'Dockerfile'
           php-version: 8.1
           pgsql-version: 16
-          drupal-version: 10.3.x-dev
+          drupal-version: 10.4.x-dev
diff --git a/.github/workflows/MAIN-phpunit-Grid2B.yml b/.github/workflows/MAIN-phpunit-Grid2B.yml
@@ -3,19 +3,19 @@ on:
   push:
     branches:
       - 4.x
+      - g5.125-supportD11
 
 ## 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
@@ -29,4 +29,4 @@ jobs:
           dockerfile: 'Dockerfile'
           php-version: 8.2
           pgsql-version: 16
-          drupal-version: 10.3.x-dev
+          drupal-version: 10.4.x-dev
diff --git a/.github/workflows/MAIN-phpunit-Grid2C.yml b/.github/workflows/MAIN-phpunit-Grid2C.yml
@@ -3,19 +3,19 @@ on:
   push:
     branches:
       - 4.x
+      - g5.125-supportD11
 
 ## 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
@@ -29,4 +29,4 @@ jobs:
           dockerfile: 'Dockerfile'
           php-version: 8.3
           pgsql-version: 16
-          drupal-version: 10.3.x-dev
+          drupal-version: 10.4.x-dev
diff --git a/.github/workflows/MAIN-phpunit-Grid3A.yml b/.github/workflows/MAIN-phpunit-Grid3A.yml
@@ -3,19 +3,19 @@ on:
   push:
     branches:
       - 4.x
+      - g5.125-supportD11
 
 ## 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
@@ -29,4 +29,4 @@ jobs:
           dockerfile: 'Dockerfile'
           php-version: 8.1
           pgsql-version: 16
-          drupal-version: 10.4.x-dev
+          drupal-version: 10.5.x-dev
diff --git a/.github/workflows/MAIN-phpunit-Grid3B.yml b/.github/workflows/MAIN-phpunit-Grid3B.yml
@@ -3,19 +3,19 @@ on:
   push:
     branches:
       - 4.x
+      - g5.125-supportD11
 
 ## 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
@@ -29,4 +29,4 @@ jobs:
           dockerfile: 'Dockerfile'
           php-version: 8.2
           pgsql-version: 16
-          drupal-version: 10.4.x-dev
+          drupal-version: 10.5.x-dev
diff --git a/.github/workflows/MAIN-phpunit-Grid3C.yml b/.github/workflows/MAIN-phpunit-Grid3C.yml
@@ -3,19 +3,19 @@ on:
   push:
     branches:
       - 4.x
+      - g5.125-supportD11
 
 ## 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
@@ -29,4 +29,4 @@ jobs:
           dockerfile: 'Dockerfile'
           php-version: 8.3
           pgsql-version: 16
-          drupal-version: 10.4.x-dev
+          drupal-version: 10.5.x-dev
diff --git a/.github/workflows/MAIN-phpunit-Grid4C.yml b/.github/workflows/MAIN-phpunit-Grid4C.yml
@@ -0,0 +1,32 @@
+name: PHPUnit
+on:
+  push:
+    branches:
+      - 4.x
+      - g5.125-supportD11
+
+## 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