Skip to content

Commit 8b0dbca

Browse files
Chartman123Chartman123
authored
Merge pull request #3658 from nextcloud/automated/noid/main-update-workflows
[main] ci(actions): Update workflow templates from organization template repository
2 parents 7de9472 + 9bd3bb3 commit 8b0dbca

9 files changed

Lines changed: 124 additions & 121 deletions

‎.github/actions-lock.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ dc0ae733f35c60274937c2647c027d46 lint-eslint.yml
1010
ab3a506506b1d7c1cea9593ecfd84366 lint-stylelint.yml
1111
d5f511793e785e83842609afc0317b24 node-test.yml
1212
b45e44d9ffe39586b38b6a925c1a9740 openapi.yml
13-
2c5f31d4cece1f2758df93e35d49cf0c phpunit-mariadb.yml
14-
4ced3302b18f5a32829eadde7a02400c phpunit-mysql.yml
15-
02dde22c83fc396f4f566f589494486f phpunit-oci.yml
16-
c3d489abcf3148e277f023afaa9e2182 phpunit-pgsql.yml
17-
e86927ad532dd0eb6b20f3a48274cc82 phpunit-sqlite.yml
13+
6d8eebf482b2932971b7912139f16d9f phpunit-mariadb.yml
14+
3cacf28a710b387e83d3858af40b7ffe phpunit-mysql.yml
15+
f89c18551d6a29af9bca63a0fd30a039 phpunit-oci.yml
16+
12a43f55ac6aedc321b62e00f9d864f0 phpunit-pgsql.yml
17+
ba5a538fea1a9e53dfcbeb53b83ea6fa phpunit-sqlite.yml
1818
aaa395a26591445ccf4c8196d7f01ee7 pr-feedback.yml
1919
6c355cb7b5d4da4d56a58e6d7f82881b psalm-matrix.yml
2020
c2fc57f15bc64e5066b79a398021ca1a rector-apply.yml
2121
2dbec18233063b42f4d8e03bbb43671c reuse.yml
2222
b47a9fe981a7435caea92db33f5ad121 sync-workflow-templates.yml
23-
0d4a72e82e345087f423a23cd06ab28c playwright.yml
23+
4937ebfd80117c0133473d8ef51d8802 playwright.yml

‎.github/workflows/phpunit-mariadb.yml‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,16 @@ concurrency:
1818
cancel-in-progress: true
1919

2020
jobs:
21-
matrix:
22-
runs-on: ubuntu-latest-low
23-
outputs:
24-
php-version: ${{ steps.versions.outputs.php-available-list }}
25-
server-max: ${{ steps.versions.outputs.branches-max-list }}
26-
steps:
27-
- name: Checkout app
28-
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
29-
with:
30-
persist-credentials: false
31-
32-
- name: Get version matrix
33-
id: versions
34-
uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3
35-
36-
changes:
21+
changes-and-matrix:
3722
runs-on: ubuntu-latest-low
3823
permissions:
3924
contents: read
4025
pull-requests: read
4126

4227
outputs:
43-
src: ${{ steps.changes.outputs.src}}
28+
src: ${{ steps.changes.outputs.src }}
29+
php-version: ${{ steps.versions.outputs.php-available-list }}
30+
server-max: ${{ steps.versions.outputs.branches-max-list }}
4431

4532
steps:
4633
- uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
@@ -60,17 +47,28 @@ jobs:
6047
- 'composer.json'
6148
- 'composer.lock'
6249
50+
- name: Checkout app
51+
if: steps.changes.outputs.src != 'false'
52+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
53+
with:
54+
persist-credentials: false
55+
56+
- name: Get version matrix
57+
if: steps.changes.outputs.src != 'false'
58+
id: versions
59+
uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3
60+
6361
phpunit-mariadb:
6462
runs-on: ubuntu-latest
6563

66-
needs: [changes, matrix]
67-
if: needs.changes.outputs.src != 'false'
64+
needs: changes-and-matrix
65+
if: needs.changes-and-matrix.outputs.src != 'false'
6866

6967
strategy:
7068
fail-fast: false
7169
matrix:
72-
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
73-
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
70+
php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }}
71+
server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }}
7472
mariadb-versions: ['10.6', '11.4']
7573

7674
name: MariaDB ${{ matrix.mariadb-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
@@ -204,12 +202,12 @@ jobs:
204202
permissions:
205203
contents: none
206204
runs-on: ubuntu-latest-low
207-
needs: [changes, phpunit-mariadb]
205+
needs: [changes-and-matrix, phpunit-mariadb]
208206

209207
if: always()
210208

211209
name: phpunit-mariadb-summary
212210

213211
steps:
214212
- name: Summary status
215-
run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-mariadb.result != 'success' }}; then exit 1; fi
213+
run: if ${{ needs.changes-and-matrix.outputs.src != 'false' && needs.phpunit-mariadb.result != 'success' }}; then exit 1; fi

‎.github/workflows/phpunit-mysql.yml‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,15 @@ concurrency:
1818
cancel-in-progress: true
1919

2020
jobs:
21-
matrix:
22-
runs-on: ubuntu-latest-low
23-
outputs:
24-
matrix: ${{ steps.versions.outputs.sparse-matrix }}
25-
steps:
26-
- name: Checkout app
27-
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
28-
with:
29-
persist-credentials: false
30-
31-
- name: Get version matrix
32-
id: versions
33-
uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3
34-
with:
35-
matrix: '{"mysql-versions": ["8.4"]}'
36-
37-
changes:
21+
changes-and-matrix:
3822
runs-on: ubuntu-latest-low
3923
permissions:
4024
contents: read
4125
pull-requests: read
4226

4327
outputs:
44-
src: ${{ steps.changes.outputs.src}}
28+
src: ${{ steps.changes.outputs.src }}
29+
matrix: ${{ steps.versions.outputs.sparse-matrix }}
4530

4631
steps:
4732
- uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
@@ -61,15 +46,28 @@ jobs:
6146
- 'composer.json'
6247
- 'composer.lock'
6348
49+
- name: Checkout app
50+
if: steps.changes.outputs.src != 'false'
51+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
52+
with:
53+
persist-credentials: false
54+
55+
- name: Get version matrix
56+
if: steps.changes.outputs.src != 'false'
57+
id: versions
58+
uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3
59+
with:
60+
matrix: '{"mysql-versions": ["8.4"]}'
61+
6462
phpunit-mysql:
6563
runs-on: ubuntu-latest
6664

67-
needs: [changes, matrix]
68-
if: needs.changes.outputs.src != 'false'
65+
needs: changes-and-matrix
66+
if: needs.changes-and-matrix.outputs.src != 'false'
6967

7068
strategy:
7169
fail-fast: false
72-
matrix: ${{ fromJson(needs.matrix.outputs.matrix) }}
70+
matrix: ${{ fromJson(needs.changes-and-matrix.outputs.matrix) }}
7371

7472
name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
7573

@@ -202,12 +200,12 @@ jobs:
202200
permissions:
203201
contents: none
204202
runs-on: ubuntu-latest-low
205-
needs: [changes, phpunit-mysql]
203+
needs: [changes-and-matrix, phpunit-mysql]
206204

207205
if: always()
208206

209207
name: phpunit-mysql-summary
210208

211209
steps:
212210
- name: Summary status
213-
run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-mysql.result != 'success' }}; then exit 1; fi
211+
run: if ${{ needs.changes-and-matrix.outputs.src != 'false' && needs.phpunit-mysql.result != 'success' }}; then exit 1; fi

‎.github/workflows/phpunit-mysql.yml.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ index 596d91ea..d6e8bc33 100644
77
path: apps/${{ env.APP_NAME }}
88

99
+ - name: Checkout teams dependency
10-
+ uses: actions/checkout@@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
10+
+ uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1111
+ with:
1212
+ persist-credentials: false
1313
+ repository: nextcloud/circles

‎.github/workflows/phpunit-oci.yml‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,16 @@ concurrency:
1818
cancel-in-progress: true
1919

2020
jobs:
21-
matrix:
22-
runs-on: ubuntu-latest-low
23-
outputs:
24-
php-version: ${{ steps.versions.outputs.php-available-list }}
25-
server-max: ${{ steps.versions.outputs.branches-max-list }}
26-
steps:
27-
- name: Checkout app
28-
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
29-
with:
30-
persist-credentials: false
31-
32-
- name: Get version matrix
33-
id: versions
34-
uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3
35-
36-
changes:
21+
changes-and-matrix:
3722
runs-on: ubuntu-latest-low
3823
permissions:
3924
contents: read
4025
pull-requests: read
4126

4227
outputs:
4328
src: ${{ steps.changes.outputs.src }}
29+
php-version: ${{ steps.versions.outputs.php-available-list }}
30+
server-max: ${{ steps.versions.outputs.branches-max-list }}
4431

4532
steps:
4633
- uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
@@ -60,17 +47,28 @@ jobs:
6047
- 'composer.json'
6148
- 'composer.lock'
6249
50+
- name: Checkout app
51+
if: steps.changes.outputs.src != 'false'
52+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
53+
with:
54+
persist-credentials: false
55+
56+
- name: Get version matrix
57+
if: steps.changes.outputs.src != 'false'
58+
id: versions
59+
uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3
60+
6361
phpunit-oci:
6462
runs-on: ubuntu-latest
6563

66-
needs: [changes, matrix]
67-
if: needs.changes.outputs.src != 'false'
64+
needs: changes-and-matrix
65+
if: needs.changes-and-matrix.outputs.src != 'false'
6866

6967
strategy:
7068
fail-fast: false
7169
matrix:
72-
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
73-
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
70+
php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }}
71+
server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }}
7472
oci-versions: ['18', '21', '23']
7573

7674
name: OCI ${{ matrix.oci-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
@@ -209,12 +207,12 @@ jobs:
209207
permissions:
210208
contents: none
211209
runs-on: ubuntu-latest-low
212-
needs: [changes, phpunit-oci]
210+
needs: [changes-and-matrix, phpunit-oci]
213211

214212
if: always()
215213

216214
name: phpunit-oci-summary
217215

218216
steps:
219217
- name: Summary status
220-
run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-oci.result != 'success' }}; then exit 1; fi
218+
run: if ${{ needs.changes-and-matrix.outputs.src != 'false' && needs.phpunit-oci.result != 'success' }}; then exit 1; fi

‎.github/workflows/phpunit-pgsql.yml‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,16 @@ concurrency:
1818
cancel-in-progress: true
1919

2020
jobs:
21-
matrix:
22-
runs-on: ubuntu-latest-low
23-
outputs:
24-
php-version: ${{ steps.versions.outputs.php-available-list }}
25-
server-max: ${{ steps.versions.outputs.branches-max-list }}
26-
steps:
27-
- name: Checkout app
28-
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
29-
with:
30-
persist-credentials: false
31-
32-
- name: Get version matrix
33-
id: versions
34-
uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3
35-
36-
changes:
21+
changes-and-matrix:
3722
runs-on: ubuntu-latest-low
3823
permissions:
3924
contents: read
4025
pull-requests: read
4126

4227
outputs:
4328
src: ${{ steps.changes.outputs.src }}
29+
php-version: ${{ steps.versions.outputs.php-available-list }}
30+
server-max: ${{ steps.versions.outputs.branches-max-list }}
4431

4532
steps:
4633
- uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
@@ -60,17 +47,28 @@ jobs:
6047
- 'composer.json'
6148
- 'composer.lock'
6249
50+
- name: Checkout app
51+
if: steps.changes.outputs.src != 'false'
52+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
53+
with:
54+
persist-credentials: false
55+
56+
- name: Get version matrix
57+
if: steps.changes.outputs.src != 'false'
58+
id: versions
59+
uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3
60+
6361
phpunit-pgsql:
6462
runs-on: ubuntu-latest
6563

66-
needs: [changes, matrix]
67-
if: needs.changes.outputs.src != 'false'
64+
needs: changes-and-matrix
65+
if: needs.changes-and-matrix.outputs.src != 'false'
6866

6967
strategy:
7068
fail-fast: false
7169
matrix:
72-
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
73-
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
70+
php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }}
71+
server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }}
7472

7573
name: PostgreSQL PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
7674

@@ -200,12 +198,12 @@ jobs:
200198
permissions:
201199
contents: none
202200
runs-on: ubuntu-latest-low
203-
needs: [changes, phpunit-pgsql]
201+
needs: [changes-and-matrix, phpunit-pgsql]
204202

205203
if: always()
206204

207205
name: phpunit-pgsql-summary
208206

209207
steps:
210208
- name: Summary status
211-
run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi
209+
run: if ${{ needs.changes-and-matrix.outputs.src != 'false' && needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi

0 commit comments

Comments
 (0)