Skip to content

Commit 6205b80

Browse files
kesselbkesselb
authored
Merge pull request #1050 from nextcloud/automated/noid/stable34-update-workflows
[stable34] ci(actions): Update workflow templates from organization template repository
2 parents cee93f8 + 723025f commit 6205b80

13 files changed

Lines changed: 81 additions & 57 deletions

‎.github/actions-lock.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
22
# SPDX-License-Identifier: MIT
33
25fc4c7e69e778e20bdc9eb0cc96367e block-merge-freeze.yml
4-
5a7b85f72877c560683ba523ffad11cc block-unconventional-commits.yml
4+
19ab9c47c8d96de93f37fab242c398cc block-unconventional-commits.yml
55
e6351c608939c31ae1e32923aa82aa10 dependabot-approve-merge.yml
66
2581a67c5bcdcd570427e6d51db767d7 fixup.yml
7-
870b483dbcbca59479211270d61546dd lint-php-cs.yml
8-
ee2b04d185b82fe7dd6fe6d83c6c7b45 lint-php.yml
9-
5cb2cca6386e45c0c9061192798b37a8 phpunit-mariadb.yml
10-
d676be1ed03142832d8e712962f5961c phpunit-mysql.yml
11-
ec26ef77882d1c19cba1ce168f927c2b phpunit-oci.yml
12-
e92532f6ac32d39a1ff5c5d57b9686ba phpunit-pgsql.yml
13-
9e8a660a88b8253f33593880710f1df3 phpunit-sqlite.yml
14-
3c4a096b3b7dbaef0f8e5190ffe13518 pr-feedback.yml
15-
20b5d0d45766e3793f19c9c0c8d05140 psalm.yml
16-
3975dc58817119d596a8f6ed190352ce reuse.yml
7+
4b40dd0073e16f74dd04e6d49dcc043d lint-php-cs.yml
8+
cfb31e47b6e9ab65e76c89b028754a4e lint-php.yml
9+
076e72a19e7bdf35ac5b2abee0198c43 phpunit-mariadb.yml
10+
8fab08ac7da700ee304af0bf3c18b3a3 phpunit-mysql.yml
11+
bbe9834ddb89207caf5e19d79ebb3672 phpunit-oci.yml
12+
256bf1dead4ef8479e9ce7433f871548 phpunit-pgsql.yml
13+
4ca2c2c4b1a73182667bab908e57c185 phpunit-sqlite.yml
14+
d1821b8a816578070ed8fd018f321f6d pr-feedback.yml
15+
6dc046dfbca5dc65d938265c518fcac4 psalm.yml
16+
2dbec18233063b42f4d8e03bbb43671c reuse.yml
1717
a3440826636c0fd7c2d20b1de50363da update-nextcloud-ocp-approve-merge.yml
18-
39db87018db395caf41007931817cdbd update-nextcloud-ocp.yml
18+
f5632e6d28c6afca9d4d46131fb48d57 update-nextcloud-ocp.yml

‎.github/workflows/block-unconventional-commits.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
30+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3131
with:
3232
persist-credentials: false
3333

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

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

2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
28+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2929
with:
3030
persist-credentials: false
3131

@@ -43,10 +43,12 @@ jobs:
4343
env:
4444
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4545

46-
- name: Install dependencies
46+
- name: Remove nextcloud/ocp
4747
run: |
4848
composer remove nextcloud/ocp --dev --no-scripts
49-
composer i
49+
50+
- name: Install composer dependencies
51+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
5052

5153
- name: Lint
5254
run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

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

Lines changed: 2 additions & 2 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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
28+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2929
with:
3030
persist-credentials: false
3131

@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
47+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4848
with:
4949
persist-credentials: false
5050

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

Lines changed: 10 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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
28+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2929
with:
3030
persist-credentials: false
3131

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

4545
steps:
46-
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
46+
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
4747
id: changes
4848
continue-on-error: true
4949
with:
@@ -92,15 +92,15 @@ jobs:
9292
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
9393
9494
- name: Checkout server
95-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
95+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9696
with:
9797
persist-credentials: false
9898
submodules: true
9999
repository: nextcloud/server
100100
ref: ${{ matrix.server-versions }}
101101

102102
- name: Checkout app
103-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
103+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
104104
with:
105105
persist-credentials: false
106106
path: apps/${{ env.APP_NAME }}
@@ -129,13 +129,17 @@ jobs:
129129
with:
130130
files: apps/${{ env.APP_NAME }}/composer.json
131131

132-
- name: Set up dependencies
132+
- name: Remove nextcloud/ocp
133133
# Only run if phpunit config file exists
134134
if: steps.check_composer.outputs.files_exists == 'true'
135135
working-directory: apps/${{ env.APP_NAME }}
136136
run: |
137137
composer remove nextcloud/ocp --dev --no-scripts
138-
composer i
138+
139+
- name: Install composer dependencies
140+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
141+
with:
142+
working-directory: apps/${{ env.APP_NAME }}
139143

140144
- name: Set up Nextcloud
141145
env:

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

Lines changed: 10 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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
27+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2828
with:
2929
persist-credentials: false
3030

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

4646
steps:
47-
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
47+
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
4848
id: changes
4949
continue-on-error: true
5050
with:
@@ -90,15 +90,15 @@ jobs:
9090
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
9191
9292
- name: Checkout server
93-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
93+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9494
with:
9595
persist-credentials: false
9696
submodules: true
9797
repository: nextcloud/server
9898
ref: ${{ matrix.server-versions }}
9999

100100
- name: Checkout app
101-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
101+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
102102
with:
103103
persist-credentials: false
104104
path: apps/${{ env.APP_NAME }}
@@ -127,13 +127,17 @@ jobs:
127127
with:
128128
files: apps/${{ env.APP_NAME }}/composer.json
129129

130-
- name: Set up dependencies
130+
- name: Remove nextcloud/ocp
131131
# Only run if phpunit config file exists
132132
if: steps.check_composer.outputs.files_exists == 'true'
133133
working-directory: apps/${{ env.APP_NAME }}
134134
run: |
135135
composer remove nextcloud/ocp --dev --no-scripts
136-
composer i
136+
137+
- name: Install composer dependencies
138+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
139+
with:
140+
working-directory: apps/${{ env.APP_NAME }}
137141

138142
- name: Set up Nextcloud
139143
env:

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

Lines changed: 10 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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
28+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2929
with:
3030
persist-credentials: false
3131

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

4545
steps:
46-
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
46+
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
4747
id: changes
4848
continue-on-error: true
4949
with:
@@ -102,15 +102,15 @@ jobs:
102102
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
103103
104104
- name: Checkout server
105-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
105+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
106106
with:
107107
persist-credentials: false
108108
submodules: true
109109
repository: nextcloud/server
110110
ref: ${{ matrix.server-versions }}
111111

112112
- name: Checkout app
113-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
113+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
114114
with:
115115
persist-credentials: false
116116
path: apps/${{ env.APP_NAME }}
@@ -134,13 +134,17 @@ jobs:
134134
with:
135135
files: apps/${{ env.APP_NAME }}/composer.json
136136

137-
- name: Set up dependencies
137+
- name: Remove nextcloud/ocp
138138
# Only run if phpunit config file exists
139139
if: steps.check_composer.outputs.files_exists == 'true'
140140
working-directory: apps/${{ env.APP_NAME }}
141141
run: |
142142
composer remove nextcloud/ocp --dev --no-scripts
143-
composer i
143+
144+
- name: Install composer dependencies
145+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
146+
with:
147+
working-directory: apps/${{ env.APP_NAME }}
144148

145149
- name: Set up Nextcloud
146150
env:

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

Lines changed: 10 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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
28+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2929
with:
3030
persist-credentials: false
3131

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

4545
steps:
46-
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
46+
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
4747
id: changes
4848
continue-on-error: true
4949
with:
@@ -93,15 +93,15 @@ jobs:
9393
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
9494
9595
- name: Checkout server
96-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
96+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
104+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
105105
with:
106106
persist-credentials: false
107107
path: apps/${{ env.APP_NAME }}
@@ -125,13 +125,17 @@ jobs:
125125
with:
126126
files: apps/${{ env.APP_NAME }}/composer.json
127127

128-
- name: Set up dependencies
128+
- name: Remove nextcloud/ocp
129129
# Only run if phpunit config file exists
130130
if: steps.check_composer.outputs.files_exists == 'true'
131131
working-directory: apps/${{ env.APP_NAME }}
132132
run: |
133133
composer remove nextcloud/ocp --dev --no-scripts
134-
composer i
134+
135+
- name: Install composer dependencies
136+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
137+
with:
138+
working-directory: apps/${{ env.APP_NAME }}
135139

136140
- name: Set up Nextcloud
137141
env:

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

Lines changed: 10 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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
28+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2929
with:
3030
persist-credentials: false
3131

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

4545
steps:
46-
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
46+
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
4747
id: changes
4848
continue-on-error: true
4949
with:
@@ -82,15 +82,15 @@ jobs:
8282
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
8383
8484
- name: Checkout server
85-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
85+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
8686
with:
8787
persist-credentials: false
8888
submodules: true
8989
repository: nextcloud/server
9090
ref: ${{ matrix.server-versions }}
9191

9292
- name: Checkout app
93-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
93+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9494
with:
9595
persist-credentials: false
9696
path: apps/${{ env.APP_NAME }}
@@ -114,13 +114,17 @@ jobs:
114114
with:
115115
files: apps/${{ env.APP_NAME }}/composer.json
116116

117-
- name: Set up dependencies
117+
- name: Remove nextcloud/ocp
118118
# Only run if phpunit config file exists
119119
if: steps.check_composer.outputs.files_exists == 'true'
120120
working-directory: apps/${{ env.APP_NAME }}
121121
run: |
122122
composer remove nextcloud/ocp --dev --no-scripts
123-
composer i
123+
124+
- name: Install composer dependencies
125+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
126+
with:
127+
working-directory: apps/${{ env.APP_NAME }}
124128

125129
- name: Set up Nextcloud
126130
env:

‎.github/workflows/pr-feedback.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
blocklist=$(curl https://raw.githubusercontent.com/nextcloud/.github/master/non-community-usernames.txt | paste -s -d, -)
3737
echo "blocklist=$blocklist" >> "$GITHUB_OUTPUT"
3838
39-
- uses: nextcloud/pr-feedback-action@f0cab224dea8e1f282f9451de322f323c78fc7a5 # main
39+
- uses: nextcloud/pr-feedback-action@5227c55be184087d0aef6338bee210d8620b6297 # v1.0.1
4040
with:
4141
feedback-message: |
4242
Hello there,

0 commit comments

Comments
 (0)