Skip to content

Commit e7525c2

Browse files
nickvergessennickvergessen
authored
Merge pull request #1020 from nextcloud/backport/984/stable34
[stable34] [main] ci(actions): Update workflow templates from organization template repository
2 parents 728ff09 + 2b17bbe commit e7525c2

21 files changed

Lines changed: 143 additions & 129 deletions

‎.github/actions-lock.txt‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
22
# SPDX-License-Identifier: MIT
3-
e20c2aa019763dd8c01214150f203ec6 appstore-build-publish.yml
4-
7dd8d21d9dd013196cd4bdbf7c24db6f dependabot-approve-merge.yml
3+
c5ce8fbd4caa30c89fb31be5a9aeb25d appstore-build-publish.yml
4+
003108ea0f5c12e1db591cd4613304d8 dependabot-approve-merge.yml
55
2581a67c5bcdcd570427e6d51db767d7 fixup.yml
6-
80a58e5584612def0e751fcfb7669814 lint-info-xml.yml
7-
ccd8a55c60e35b84becb0f7005ce1286 lint-php-cs.yml
8-
5dcc3187a9460cb62a455235cbdb3562 lint-php.yml
9-
bdca1af74c27de9a9fc2f3c70aabdc8f phpunit-mariadb.yml
10-
5846b994639ccab0059bf23e141d389a phpunit-mysql.yml
11-
ec7d1084fbb3a6803dbabf3acdd17ac8 phpunit-oci.yml
12-
29b359a5b76e7ff8cd85af34b3bf36e3 phpunit-pgsql.yml
13-
182cc739d33a2441d3a9278a9bff55b4 phpunit-sqlite.yml
6+
784303cf47612e5c4eac621dfab5b4f4 lint-info-xml.yml
7+
bb17aa6898f48f4caa83922c343731dc lint-php-cs.yml
8+
70673e479df96e3e71fe966cb07c82fa lint-php.yml
9+
883b4be7752bdbc342b6dbf7794dc378 phpunit-mariadb.yml
10+
52f8aa335a0a3ca1eeee7380854ff5ad phpunit-mysql.yml
11+
69b6d61696a328b8a17ad4aa6cb2a059 phpunit-oci.yml
12+
8e00d464a8ef10740b95dc2132244626 phpunit-pgsql.yml
13+
a7ae3a2b7529b41dae1302420eb72454 phpunit-sqlite.yml
1414
3c4a096b3b7dbaef0f8e5190ffe13518 pr-feedback.yml
15-
a6d8aa0050107ce4d8b6d166d25ca8aa psalm.yml
16-
7db5b820f3750eebe988005a0bb2febd reuse.yml
17-
a4ad57688740c06ff327edaba69b2755 sync-workflow-templates.yml
18-
800d5b188aa885626cf4169fa2dfea9e update-nextcloud-ocp-approve-merge.yml
19-
90f22641445623fb227102f8d2d87cc0 update-nextcloud-ocp.yml
15+
a6e484812c25ced8bb714182656e0ab1 psalm.yml
16+
e2bd0fc8a290e1a8641487944e27103b reuse.yml
17+
e3c7b8f43850ad1d31c67fc0082b6bb8 sync-workflow-templates.yml
18+
a3440826636c0fd7c2d20b1de50363da update-nextcloud-ocp-approve-merge.yml
19+
eb943a065c2a0711c14468fa76629eae update-nextcloud-ocp.yml
20+
22604c31b526de270a080eb19967a638 update-stable-titles.yml

‎.github/workflows/appstore-build-publish.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
3636
3737
- name: Checkout
38-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
38+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3939
with:
4040
persist-credentials: false
4141
path: ${{ env.APP_NAME }}
@@ -74,6 +74,7 @@ jobs:
7474
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
7575
with:
7676
node-version: ${{ steps.versions.outputs.nodeVersion }}
77+
package-manager-cache: false
7778

7879
- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
7980
# Skip if no package.json
@@ -87,7 +88,7 @@ jobs:
8788
filename: ${{ env.APP_NAME }}/appinfo/info.xml
8889

8990
- name: Set up php ${{ steps.php-versions.outputs.php-min }}
90-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
91+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
9192
with:
9293
php-version: ${{ steps.php-versions.outputs.php-min }}
9394
coverage: none
@@ -156,7 +157,7 @@ jobs:
156157
unzip nextcloud.zip
157158
158159
- name: Checkout server master fallback
159-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
160+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
160161
if: ${{ steps.server-download.outcome != 'success' }}
161162
with:
162163
persist-credentials: false
@@ -181,7 +182,7 @@ jobs:
181182
tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
182183
183184
- name: Attach tarball to github release
184-
uses: svenstaro/upload-release-action@29e53e917877a24fad85510ded594ab3c9ca12de # v2.11.5
185+
uses: svenstaro/upload-release-action@29e53e917877a24fad85510ded594ab3c9ca12de # 2.11.5
185186
id: attach_to_release
186187
with:
187188
repo_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/dependabot-approve-merge.yml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
if: github.event.pull_request.user.login == 'dependabot[bot]'
2828
runs-on: ubuntu-latest-low
2929
permissions:
30-
# for hmarr/auto-approve-action to approve PRs
30+
# for auto-approve step to work
3131
pull-requests: write
3232
# for alexwilson/enable-github-automerge-action to approve PRs
3333
contents: write
@@ -44,15 +44,22 @@ jobs:
4444
with:
4545
repo-token: ${{ secrets.GITHUB_TOKEN }}
4646

47-
# GitHub actions bot approve
48-
- uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
49-
if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
47+
- name: Dependabot metadata
48+
id: metadata
49+
uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
5050
with:
5151
github-token: ${{ secrets.GITHUB_TOKEN }}
5252

53+
- name: GitHub actions bot approve
54+
if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
55+
run: gh pr review --approve "$PR_URL"
56+
env:
57+
PR_URL: ${{ github.event.pull_request.html_url }}
58+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59+
5360
# Enable GitHub auto merge
5461
- name: Auto merge
55-
uses: alexwilson/enable-github-automerge-action@2c32e18a76e0726ffe7a573bfff2d42a20885126 # v3.0.0
56-
if: startsWith(steps.branchname.outputs.branch, 'dependabot/') && (github.event.pull_request.action == 'opened' || github.event.pull_request.action == 'reopened')
62+
uses: alexwilson/enable-github-automerge-action@2c32e18a76e0726ffe7a573bfff2d42a20885126 # 3.0.0
63+
if: startsWith(steps.branchname.outputs.branch, 'dependabot/') && (github.event.action == 'opened' || github.event.action == 'reopened') && (steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor')
5764
with:
5865
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/lint-info-xml.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: info.xml lint
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
27+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2828
with:
2929
persist-credentials: false
3030

‎.github/workflows/lint-php-cs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2929
with:
3030
persist-credentials: false
3131

@@ -34,7 +34,7 @@ jobs:
3434
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
3535

3636
- name: Set up php${{ steps.versions.outputs.php-min }}
37-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
37+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
3838
with:
3939
php-version: ${{ steps.versions.outputs.php-min }}
4040
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

‎.github/workflows/lint-php.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
php-max: ${{ steps.versions.outputs.php-max }}
2626
steps:
2727
- name: Checkout app
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2929
with:
3030
persist-credentials: false
3131

@@ -34,7 +34,7 @@ jobs:
3434
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
3535

3636
php-lint:
37-
runs-on: ubuntu-latest
37+
runs-on: ubuntu-latest-low
3838
needs: matrix
3939
strategy:
4040
matrix:
@@ -44,12 +44,12 @@ jobs:
4444

4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
47+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4848
with:
4949
persist-credentials: false
5050

5151
- name: Set up php ${{ matrix.php-versions }}
52-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
52+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
5353
with:
5454
php-version: ${{ matrix.php-versions }}
5555
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
server-max: ${{ steps.versions.outputs.branches-max-list }}
2626
steps:
2727
- name: Checkout app
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2929
with:
3030
persist-credentials: false
3131

@@ -93,37 +93,37 @@ jobs:
9393
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
9494
9595
- name: Checkout server
96-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
96+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
9797
with:
9898
persist-credentials: false
9999
submodules: true
100100
repository: nextcloud/server
101101
ref: ${{ matrix.server-versions }}
102102

103103
- name: Checkout app
104-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
104+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
105105
with:
106106
persist-credentials: false
107107
path: apps/${{ env.APP_NAME }}
108108

109109
- name: Checkout app (richdocuments)
110-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
110+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
111111
with:
112112
persist-credentials: false
113113
path: apps/richdocuments
114114
repository: nextcloud/richdocuments
115115
ref: ${{ matrix.richdocuments-versions }}
116116

117117
- name: Checkout app (groupfolders)
118-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
118+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
119119
with:
120120
persist-credentials: false
121121
path: apps/groupfolders
122122
repository: nextcloud/groupfolders
123123
ref: ${{ matrix.groupfolders-versions }}
124124

125125
- name: Set up php ${{ matrix.php-versions }}
126-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
126+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
127127
with:
128128
php-version: ${{ matrix.php-versions }}
129129
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@ index 5f8501e..8de1fcc 100644
66
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
77
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
88
mariadb-versions: ['10.6', '11.4']
9-
+ richdocuments-versions: ['main']
10-
+ groupfolders-versions: ['master']
11-
9+
+ richdocuments-versions: ['stable34']
10+
+ groupfolders-versions: ['stable34']
11+
1212
name: MariaDB ${{ matrix.mariadb-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
13-
14-
@@ -104,16 +106,32 @@ jobs:
13+
14+
@@ -106,16 +106,32 @@ jobs:
1515
persist-credentials: false
1616
path: apps/${{ env.APP_NAME }}
17-
17+
1818
+ - name: Checkout app (richdocuments)
19-
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19+
+ uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2020
+ with:
2121
+ persist-credentials: false
2222
+ path: apps/richdocuments
2323
+ repository: nextcloud/richdocuments
2424
+ ref: ${{ matrix.richdocuments-versions }}
2525
+
2626
+ - name: Checkout app (groupfolders)
27-
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
27+
+ uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2828
+ with:
2929
+ persist-credentials: false
3030
+ path: apps/groupfolders
3131
+ repository: nextcloud/groupfolders
3232
+ ref: ${{ matrix.groupfolders-versions }}
3333
+
3434
- name: Set up php ${{ matrix.php-versions }}
35-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
35+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
3636
with:
3737
php-version: ${{ matrix.php-versions }}
3838
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -45,11 +45,11 @@ index 5f8501e..8de1fcc 100644
4545
+ ini-values: apc.enable_cli=on, disable_functions=
4646
env:
4747
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48-
48+
4949
@@ -136,6 +154,14 @@ jobs:
5050
composer remove nextcloud/ocp --dev --no-scripts
5151
composer i
52-
52+
5353
+ - name: Set up dependencies (richdocuments)
5454
+ working-directory: apps/richdocuments
5555
+ run: composer i --no-dev

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix: ${{ steps.versions.outputs.sparse-matrix }}
2525
steps:
2626
- name: Checkout app
27-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
27+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2828
with:
2929
persist-credentials: false
3030

@@ -89,37 +89,37 @@ jobs:
8989
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
9090
9191
- name: Checkout server
92-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
92+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
9393
with:
9494
persist-credentials: false
9595
submodules: true
9696
repository: nextcloud/server
9797
ref: ${{ matrix.server-versions }}
9898

9999
- name: Checkout app
100-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
100+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
101101
with:
102102
persist-credentials: false
103103
path: apps/${{ env.APP_NAME }}
104104

105105
- name: Checkout app (richdocuments)
106-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
106+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
107107
with:
108108
persist-credentials: false
109109
path: apps/richdocuments
110110
repository: nextcloud/richdocuments
111111
ref: ${{ matrix.richdocuments-versions }}
112112

113113
- name: Checkout app (groupfolders)
114-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
114+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
115115
with:
116116
persist-credentials: false
117117
path: apps/groupfolders
118118
repository: nextcloud/groupfolders
119119
ref: ${{ matrix.groupfolders-versions }}
120120

121121
- name: Set up php ${{ matrix.php-versions }}
122-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
122+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
123123
with:
124124
php-version: ${{ matrix.php-versions }}
125125
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,32 @@ index fcc0750..ada49fc 100644
77
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
88
with:
99
- matrix: '{"mysql-versions": ["8.4"]}'
10-
+ matrix: '{"mysql-versions": ["8.4"], "richdocuments-versions": ["main"], "groupfolders-versions": ["master"]}'
11-
10+
+ matrix: '{"mysql-versions": ["8.4"], "richdocuments-versions": ["stable34"], "groupfolders-versions": ["stable34"]}'
11+
1212
changes:
1313
runs-on: ubuntu-latest-low
1414
@@ -102,16 +102,32 @@ jobs:
1515
persist-credentials: false
1616
path: apps/${{ env.APP_NAME }}
17-
17+
1818
+ - name: Checkout app (richdocuments)
19-
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19+
+ uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2020
+ with:
2121
+ persist-credentials: false
2222
+ path: apps/richdocuments
2323
+ repository: nextcloud/richdocuments
2424
+ ref: ${{ matrix.richdocuments-versions }}
2525
+
2626
+ - name: Checkout app (groupfolders)
27-
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
27+
+ uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2828
+ with:
2929
+ persist-credentials: false
3030
+ path: apps/groupfolders
3131
+ repository: nextcloud/groupfolders
3232
+ ref: ${{ matrix.groupfolders-versions }}
3333
+
3434
- name: Set up php ${{ matrix.php-versions }}
35-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
35+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
3636
with:
3737
php-version: ${{ matrix.php-versions }}
3838
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -45,11 +45,11 @@ index fcc0750..ada49fc 100644
4545
+ ini-values: apc.enable_cli=on, disable_functions=
4646
env:
4747
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48-
48+
4949
@@ -134,6 +150,14 @@ jobs:
5050
composer remove nextcloud/ocp --dev --no-scripts
5151
composer i
52-
52+
5353
+ - name: Set up dependencies (richdocuments)
5454
+ working-directory: apps/richdocuments
5555
+ run: composer i --no-dev

0 commit comments

Comments
 (0)