Skip to content

Commit 14a8042

Browse files
nickvergessennickvergessen
authored
Merge pull request #922 from nextcloud/automated/noid/stable33-update-workflows
[stable33] ci(actions): Update workflow templates from organization template repository
2 parents a2378c4 + 4478859 commit 14a8042

19 files changed

Lines changed: 401 additions & 67 deletions

‎.github/actions-lock.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
2+
# SPDX-License-Identifier: MIT
3+
794da3d3e247bf6eb3601f542210906f appstore-build-publish.yml
4+
d1898b1290d50f874d8092ebda6ee5e1 dependabot-approve-merge.yml
5+
2581a67c5bcdcd570427e6d51db767d7 fixup.yml
6+
80a58e5584612def0e751fcfb7669814 lint-info-xml.yml
7+
ccd8a55c60e35b84becb0f7005ce1286 lint-php-cs.yml
8+
5dcc3187a9460cb62a455235cbdb3562 lint-php.yml
9+
238e1da112e5f2aaa69c3f7ec9f4ebfa phpunit-mariadb.yml
10+
1c6d23a5f35e6bc1eea95c650e4f964b phpunit-mysql.yml
11+
2f8446b9ad19ee8debde6d712c81df95 phpunit-oci.yml
12+
169f77f131715906a40eb02877b650d3 phpunit-pgsql.yml
13+
fd94bce519297d48245483d469da9fcc phpunit-sqlite.yml
14+
3c4a096b3b7dbaef0f8e5190ffe13518 pr-feedback.yml
15+
2070d9569f327e758b9ce2b924c28fef psalm.yml
16+
7db5b820f3750eebe988005a0bb2febd reuse.yml
17+
800d5b188aa885626cf4169fa2dfea9e update-nextcloud-ocp-approve-merge.yml
18+
8e930a499e9e608b95ef45193e90259e update-nextcloud-ocp.yml

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

Lines changed: 8 additions & 8 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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
38+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3939
with:
4040
persist-credentials: false
4141
path: ${{ env.APP_NAME }}
@@ -82,12 +82,12 @@ jobs:
8282

8383
- name: Get php version
8484
id: php-versions
85-
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
85+
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
8686
with:
8787
filename: ${{ env.APP_NAME }}/appinfo/info.xml
8888

8989
- name: Set up php ${{ steps.php-versions.outputs.php-min }}
90-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
90+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
9191
with:
9292
php-version: ${{ steps.php-versions.outputs.php-min }}
9393
coverage: none
@@ -156,7 +156,7 @@ jobs:
156156
unzip nextcloud.zip
157157
158158
- name: Checkout server master fallback
159-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
159+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
160160
if: ${{ steps.server-download.outcome != 'success' }}
161161
with:
162162
persist-credentials: false
@@ -172,7 +172,7 @@ jobs:
172172
tar -xvf ${{ env.APP_NAME }}.tar.gz
173173
cd ../../../
174174
# Setting up keys
175-
echo '${{ secrets.APP_PRIVATE_KEY }}' > ${{ env.APP_NAME }}.key
175+
echo '${{ secrets.APP_PRIVATE_KEY }}' > ${{ env.APP_NAME }}.key # zizmor: ignore[secrets-outside-env]
176176
wget --quiet "https://github.com/nextcloud/app-certificate-requests/raw/master/${{ env.APP_NAME }}/${{ env.APP_NAME }}.crt"
177177
# Signing
178178
php nextcloud/occ integrity:sign-app --privateKey=../${{ env.APP_NAME }}.key --certificate=../${{ env.APP_NAME }}.crt --path=../${{ env.APP_NAME }}/build/artifacts/${{ env.APP_NAME }}
@@ -181,7 +181,7 @@ jobs:
181181
tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
182182
183183
- name: Attach tarball to github release
184-
uses: svenstaro/upload-release-action@6b7fa9f267e90b50a19fef07b3596790bb941741 # v2.11.3
184+
uses: svenstaro/upload-release-action@29e53e917877a24fad85510ded594ab3c9ca12de # v2.11.5
185185
id: attach_to_release
186186
with:
187187
repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -194,6 +194,6 @@ jobs:
194194
uses: nextcloud-releases/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1 # v1.0.3
195195
with:
196196
app_name: ${{ env.APP_NAME }}
197-
appstore_token: ${{ secrets.APPSTORE_TOKEN }}
197+
appstore_token: ${{ secrets.APPSTORE_TOKEN }} # zizmor: ignore[secrets-outside-env]
198198
download_url: ${{ steps.attach_to_release.outputs.browser_download_url }}
199-
app_private_key: ${{ secrets.APP_PRIVATE_KEY }}
199+
app_private_key: ${{ secrets.APP_PRIVATE_KEY }} # zizmor: ignore[secrets-outside-env]

‎.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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
27+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2828
with:
2929
persist-credentials: false
3030

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

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

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

3232
- name: Get php version
3333
id: versions
34-
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
34+
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@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
37+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
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: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,35 @@ jobs:
2121
matrix:
2222
runs-on: ubuntu-latest-low
2323
outputs:
24-
php-versions: ${{ steps.versions.outputs.php-versions }}
24+
php-min: ${{ steps.versions.outputs.php-min }}
25+
php-max: ${{ steps.versions.outputs.php-max }}
2526
steps:
2627
- name: Checkout app
27-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
28+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2829
with:
2930
persist-credentials: false
3031

3132
- name: Get version matrix
3233
id: versions
33-
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.0.0
34+
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
3435

3536
php-lint:
3637
runs-on: ubuntu-latest
3738
needs: matrix
3839
strategy:
3940
matrix:
40-
php-versions: ${{fromJson(needs.matrix.outputs.php-versions)}}
41+
php-versions: ['${{ needs.matrix.outputs.php-min }}', '${{ needs.matrix.outputs.php-max }}']
4142

4243
name: php-lint
4344

4445
steps:
4546
- name: Checkout
46-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
47+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4748
with:
4849
persist-credentials: false
4950

5051
- name: Set up php ${{ matrix.php-versions }}
51-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
52+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
5253
with:
5354
php-version: ${{ matrix.php-versions }}
5455
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
server-max: ${{ steps.versions.outputs.branches-max-list }}
2626
steps:
2727
- name: Checkout app
28-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
28+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2929
with:
3030
persist-credentials: false
3131

3232
- name: Get version matrix
3333
id: versions
34-
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
34+
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
3535

3636
changes:
3737
runs-on: ubuntu-latest-low
@@ -43,7 +43,7 @@ jobs:
4343
src: ${{ steps.changes.outputs.src}}
4444

4545
steps:
46-
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
46+
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
4747
id: changes
4848
continue-on-error: true
4949
with:
@@ -93,37 +93,37 @@ jobs:
9393
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
9494
9595
- name: Checkout server
96-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
96+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
104+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
105105
with:
106106
persist-credentials: false
107107
path: apps/${{ env.APP_NAME }}
108108

109109
- name: Checkout app (richdocuments)
110-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
110+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
118+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
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@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
126+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
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: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
2+
index 5f8501e..8de1fcc 100644
3+
--- a/.github/workflows/phpunit-mariadb.yml
4+
+++ b/.github/workflows/phpunit-mariadb.yml
5+
@@ -71,6 +71,8 @@ jobs:
6+
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
7+
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
8+
mariadb-versions: ['10.6', '11.4']
9+
+ richdocuments-versions: ['stable33']
10+
+ groupfolders-versions: ['stable33']
11+
12+
name: MariaDB ${{ matrix.mariadb-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
13+
14+
@@ -104,16 +106,32 @@ jobs:
15+
persist-credentials: false
16+
path: apps/${{ env.APP_NAME }}
17+
18+
+ - name: Checkout app (richdocuments)
19+
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
20+
+ with:
21+
+ persist-credentials: false
22+
+ path: apps/richdocuments
23+
+ repository: nextcloud/richdocuments
24+
+ ref: ${{ matrix.richdocuments-versions }}
25+
+
26+
+ - name: Checkout app (groupfolders)
27+
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
+ with:
29+
+ persist-credentials: false
30+
+ path: apps/groupfolders
31+
+ repository: nextcloud/groupfolders
32+
+ ref: ${{ matrix.groupfolders-versions }}
33+
+
34+
- name: Set up php ${{ matrix.php-versions }}
35+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
36+
with:
37+
php-version: ${{ matrix.php-versions }}
38+
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
39+
- extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql
40+
+ extensions: apcu, bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql
41+
coverage: none
42+
ini-file: development
43+
# Temporary workaround for missing pcntl_* in PHP 8.3
44+
- ini-values: disable_functions=
45+
+ ini-values: apc.enable_cli=on, disable_functions=
46+
env:
47+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48+
49+
@@ -136,6 +154,14 @@ jobs:
50+
composer remove nextcloud/ocp --dev --no-scripts
51+
composer i
52+
53+
+ - name: Set up dependencies (richdocuments)
54+
+ working-directory: apps/richdocuments
55+
+ run: composer i --no-dev
56+
+
57+
+ - name: Set up dependencies (groupfolders)
58+
+ working-directory: apps/groupfolders
59+
+ run: composer i --no-dev
60+
+
61+
- name: Set up Nextcloud
62+
env:
63+
DB_PORT: 4444

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

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

3131
- name: Get version matrix
3232
id: versions
33-
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
33+
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
3434
with:
3535
matrix: '{"mysql-versions": ["8.4"], "richdocuments-versions": ["stable33"], "groupfolders-versions": ["stable33"]}'
3636

@@ -44,7 +44,7 @@ jobs:
4444
src: ${{ steps.changes.outputs.src}}
4545

4646
steps:
47-
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
47+
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
4848
id: changes
4949
continue-on-error: true
5050
with:
@@ -89,37 +89,37 @@ jobs:
8989
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
9090
9191
- name: Checkout server
92-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
92+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
100+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
101101
with:
102102
persist-credentials: false
103103
path: apps/${{ env.APP_NAME }}
104104

105105
- name: Checkout app (richdocuments)
106-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
106+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
114+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
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@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
122+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
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

0 commit comments

Comments
 (0)