Skip to content

Commit 2431ff1

Browse files
authored
Add back D10 support
1 parent be6d72f commit 2431ff1

File tree

2 files changed

+40
-22
lines changed

2 files changed

+40
-22
lines changed

.github/workflows/test-microsites.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ jobs:
2828
localgov-version:
2929
- '4.x'
3030
drupal-version:
31-
- '~11.0'
31+
- '~10.0'
3232
php-version:
33+
- '8.1'
34+
- '8.2'
3335
- '8.3'
34-
- '8.4'
3536

3637
steps:
3738
- name: Save git branch and git repo names to env if this is not a pull request
@@ -118,9 +119,9 @@ jobs:
118119
localgov-version:
119120
- '4.x'
120121
drupal-version:
121-
- '~11.0'
122+
- '~10.0'
122123
php-version:
123-
- '8.4'
124+
- '8.3'
124125

125126
steps:
126127
- name: Cached workspace
@@ -154,9 +155,9 @@ jobs:
154155
localgov-version:
155156
- '4.x'
156157
drupal-version:
157-
- '~11.0'
158+
- '~10.0'
158159
php-version:
159-
- '8.4'
160+
- '8.3'
160161

161162
steps:
162163
- name: Cached workspace
@@ -192,10 +193,11 @@ jobs:
192193
localgov-version:
193194
- '4.x'
194195
drupal-version:
195-
- '~11.0'
196+
- '~10.0'
196197
php-version:
198+
- '8.1'
199+
- '8.2'
197200
- '8.3'
198-
- '8.4'
199201

200202
steps:
201203
- name: Clone Drupal container

.github/workflows/test-module.yml

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,18 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
include:
29+
- localgov-version: '3.x'
30+
drupal-version: '~10.0'
31+
php-version: '8.1'
32+
- localgov-version: '3.x'
33+
drupal-version: '~10.0'
34+
php-version: '8.2'
35+
- localgov-version: '3.x'
36+
drupal-version: '~10.0'
37+
php-version: '8.3'
38+
- localgov-version: '3.x'
39+
drupal-version: '~10.0'
40+
php-version: '8.4'
2941
- localgov-version: '4.x'
3042
drupal-version: '~11.0'
3143
php-version: '8.3'
@@ -80,29 +92,21 @@ jobs:
8092
repository: localgovdrupal/drupal-container
8193
ref: php${{ matrix.php-version }}
8294

83-
# Split project creation to make debugging easier for now
84-
- name: Create LocalGov Drupal 10 project
85-
if: matrix.drupal-version == '~10.0'
95+
- name: Authenticate with Github
96+
run: |
97+
composer --working-dir=html config repositories.1 vcs [email protected]:${{inputs.project}}.git
98+
composer global config github-oauth.github.com ${{ github.token }}
99+
100+
- name: Create LocalGov Drupal project
86101
run: |
87102
composer create-project --stability dev --no-install localgovdrupal/localgov-project ./html "${{ matrix.localgov-version }}"
88103
composer --working-dir=./html require --no-install localgovdrupal/localgov:${{ matrix.localgov-version }}-dev
89104
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 }}
90105
composer --working-dir=./html install
91106
92-
# Split project creation to make debugging easier for now
93-
- name: Create LocalGov Drupal 11 project
94-
if: matrix.drupal-version == '~11.0'
95-
run: |
96-
composer create-project --stability dev --no-install localgovdrupal/localgov-project ./html "3.2.x"
97-
composer require --working-dir=./html --no-install --with-all-dependencies localgovdrupal/localgov:3.2.x-dev
98-
composer require --working-dir=./html --no-install --with-all-dependencies 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 }}
99-
composer install --working-dir=./html
100-
101107
- name: Obtain the test target using Composer
102108
if: env.HEAD_USER == 'localgovdrupal'
103109
run: |
104-
composer --working-dir=html config repositories.1 vcs [email protected]:${{inputs.project}}.git
105-
composer global config github-oauth.github.com ${{ github.token }}
106110
composer --working-dir=./html require --with-all-dependencies ${{inputs.project}}:"${COMPOSER_REF} as ${LATEST_RELEASE}"
107111
108112
- name: Obtain the test target using Git
@@ -318,6 +322,18 @@ jobs:
318322
fail-fast: false
319323
matrix:
320324
include:
325+
- localgov-version: '3.x'
326+
drupal-version: '~10.0'
327+
php-version: '8.1'
328+
- localgov-version: '3.x'
329+
drupal-version: '~10.0'
330+
php-version: '8.2'
331+
- localgov-version: '3.x'
332+
drupal-version: '~10.0'
333+
php-version: '8.3'
334+
- localgov-version: '3.x'
335+
drupal-version: '~10.0'
336+
php-version: '8.4'
321337
- localgov-version: '4.x'
322338
drupal-version: '~11.0'
323339
php-version: '8.3'

0 commit comments

Comments
 (0)