Merge pull request #229 from localgovdrupal/feature/2.x/203-drupal-10…

…-support Added Drupal 10 support
localgovdrupal · Sep 11, 2023 · 7622ff4 · 7622ff4
2 parents ee635dd + bea0196
commit 7622ff4
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 37 deletions.
diff --git a/.github/workflows/localgov_microsites.yml b/.github/workflows/localgov_microsites.yml
@@ -14,7 +14,6 @@ on:
 env:
   LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_microsites_base
   LOCALGOV_DRUPAL_PROJECT_PATH: web/themes/contrib/localgov_microsites_base
-  MICROSITES_VERSION: 2.1.x
 
 jobs:
 
@@ -25,12 +24,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '8.1'
+        include:
+          - profile-version: '2.1.x'
+            project-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - profile-version: '3.x'
+            project-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
@@ -67,7 +69,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ./html
-          key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
+          key: localgov-build-${{ matrix.profile-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -82,8 +84,8 @@ jobs:
 
       - name: Create LocalGov Microsites project
         run: |
-          composer create-project --stability dev --no-install localgovdrupal/localgov_microsites_project ./html "${{ matrix.localgov-version }}"
-          composer --working-dir=./html require --no-install localgovdrupal/localgov_microsites:${MICROSITES_VERSION}-dev
+          composer create-project --stability dev --no-install localgovdrupal/localgov_microsites_project ./html "${{ matrix.project-version }}"
+          composer --working-dir=./html require --no-install localgovdrupal/localgov_microsites:${{ matrix.profile-version }}-dev
           composer --working-dir=./html require --no-install drupal/core-recommended:${{ matrix.drupal-version }} drupal/core-composer-scaffold:${{ matrix.drupal-version }} drupal/core-project-message:${{ matrix.drupal-version }} drupal/core-dev:${{ matrix.drupal-version }}
           composer --working-dir=./html install
 
@@ -108,22 +110,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '8.1'
+        include:
+          - profile-version: '2.1.x'
+            project-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - profile-version: '3.x'
+            project-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
       - name: Cached workspace
         uses: actions/cache@v2
         with:
           path: ./html
-          key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
+          key: localgov-build-${{ matrix.profile-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
           restore-keys: |
-            localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
+            localgov-build-${{ matrix.profile-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -143,22 +148,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '8.1'
+        include:
+          - profile-version: '2.1.x'
+            project-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - profile-version: '3.x'
+            project-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
       - name: Cached workspace
         uses: actions/cache@v2
         with:
           path: ./html
-          key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
+          key: localgov-build-${{ matrix.profile-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
           restore-keys: |
-            localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
+            localgov-build-${{ matrix.profile-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -177,12 +185,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '8.1'
+        include:
+          - profile-version: '2.1.x'
+            project-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - profile-version: '3.x'
+            project-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
@@ -196,9 +207,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ./html
-          key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
+          key: localgov-build-${{ matrix.profile-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
           restore-keys: |
-            localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
+            localgov-build-${{ matrix.profile-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
 
       - name: Start Docker environment
         run: docker-compose -f docker-compose.yml up -d

diff --git a/composer.json b/composer.json
@@ -5,8 +5,8 @@
     "homepage": "https://github.com/localgovdrupal/localgov_microsites_base",
     "license": "GPL-2.0-or-later",
     "require": {
-        "drupal/twig_tweak": "^3.1",
+        "drupal/twig_tweak": "^3.2",
         "localgovdrupal/localgov_base": "^1.0.0",
-        "localgovdrupal/localgov_microsites_group": "^2.0.0-beta1"
+        "localgovdrupal/localgov_microsites_group": "^2.0.0@beta || ^3.x-dev"
     }
 }
diff --git a/localgov_microsites_base.info.yml b/localgov_microsites_base.info.yml
@@ -1,7 +1,7 @@
 name: "LocalGov Microsites Base"
 description: "Your sub-theme, which uses localgov_base as its base theme."
 type: theme
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 base theme: "localgov_base"
 
 dependencies: