Skip to content

Commit e7b1400

Browse files
Chartman123Chartman123
authored
Merge pull request #3498 from nextcloud/automated/noid/main-update-workflows
[main] ci(actions): Update workflow templates from organization template repository
2 parents 2130ea3 + 52340d0 commit e7b1400

21 files changed

Lines changed: 311 additions & 31 deletions

‎.github/actions-lock.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
2+
# SPDX-License-Identifier: MIT
3+
3c9e67bdc06a172cae6461ab6801f95e appstore-build-publish.yml
4+
e6351c608939c31ae1e32923aa82aa10 dependabot-approve-merge.yml
5+
2581a67c5bcdcd570427e6d51db767d7 fixup.yml
6+
2a205b6cc57c26c31a18a7f41190f3e2 lint-eslint.yml
7+
023b664746d1f2e09a9aaaac772ff7f5 lint-info-xml.yml
8+
660a12f14e32c1b2d24c418232d918da lint-php-cs.yml
9+
ee2b04d185b82fe7dd6fe6d83c6c7b45 lint-php.yml
10+
351799835db66dd8d20e324970490e96 lint-stylelint.yml
11+
e8c1aea88c781b9d47186a2f38b209d6 node-test.yml
12+
be4595b4233fc29c9b6fb4a6e71cae6e openapi.yml
13+
c430223b9be698107fc1c10ddd3b4580 phpunit-mariadb.yml
14+
301cb65c1ccc97c22129ad3960ce7f5b phpunit-mysql.yml
15+
fd5eecd6642b35edcff1ab4245a5db76 phpunit-oci.yml
16+
59058fad92d407ffcf16efd401ef1cd5 phpunit-pgsql.yml
17+
dad763027c0d87999474917d6818dbc9 phpunit-sqlite.yml
18+
d1821b8a816578070ed8fd018f321f6d pr-feedback.yml
19+
19d3ab0a48769d30c1cf16b53139b2f8 psalm-matrix.yml
20+
61ceb8f4bddaa49bfdd452111eee7cf9 rector-apply.yml
21+
3975dc58817119d596a8f6ed190352ce reuse.yml
22+
9799b1a6a842b5c0076b76de651a0e0d sync-workflow-templates.yml

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,11 @@ jobs:
103103

104104
- name: Install composer dependencies
105105
if: steps.check_composer.outputs.files_exists == 'true'
106-
run: |
107-
cd ${{ env.APP_NAME }}
108-
composer install --no-dev
106+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
107+
with:
108+
composer-options: '--no-dev'
109+
working-directory: ${{ env.APP_NAME }}
110+
ignore-cache: 'yes'
109111

110112
- name: Build ${{ env.APP_NAME }}
111113
# Skip if no package.json

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
src: ${{ steps.changes.outputs.src}}
2929

3030
steps:
31-
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
31+
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
3232
id: changes
3333
continue-on-error: true
3434
with:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2828
with:
2929
persist-credentials: false
30+
sparse-checkout: |
31+
appinfo/
3032
3133
- name: Download schema
3234
run: wget https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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/node-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
src: ${{ steps.changes.outputs.src}}
3535

3636
steps:
37-
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
37+
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
3838
id: changes
3939
continue-on-error: true
4040
with:

‎.github/workflows/openapi.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ jobs:
7878
run: |
7979
npm ci
8080
81-
- name: Set up dependencies
82-
run: composer i
81+
- name: Install composer dependencies
82+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
8383

8484
- name: Regenerate OpenAPI
8585
run: composer run openapi

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
src: ${{ steps.changes.outputs.src}}
4444

4545
steps:
46-
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
46+
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
4747
id: changes
4848
continue-on-error: true
4949
with:
@@ -67,6 +67,7 @@ jobs:
6767
if: needs.changes.outputs.src != 'false'
6868

6969
strategy:
70+
fail-fast: false
7071
matrix:
7172
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
7273
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
@@ -136,13 +137,17 @@ jobs:
136137
with:
137138
files: apps/${{ env.APP_NAME }}/composer.json
138139

139-
- name: Set up dependencies
140+
- name: Remove nextcloud/ocp
140141
# Only run if phpunit config file exists
141142
if: steps.check_composer.outputs.files_exists == 'true'
142143
working-directory: apps/${{ env.APP_NAME }}
143144
run: |
144145
composer remove nextcloud/ocp --dev --no-scripts
145-
composer i
146+
147+
- name: Install composer dependencies
148+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
149+
with:
150+
working-directory: apps/${{ env.APP_NAME }}
146151

147152
- name: Set up Nextcloud
148153
env:

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
2+
index 2e7b92b0..5d69d19c 100644
3+
--- a/.github/workflows/phpunit-mariadb.yml
4+
+++ b/.github/workflows/phpunit-mariadb.yml
5+
@@ -105,6 +105,14 @@ jobs:
6+
persist-credentials: false
7+
path: apps/${{ env.APP_NAME }}
8+
9+
+ - name: Checkout teams dependency
10+
+ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
11+
+ with:
12+
+ persist-credentials: false
13+
+ repository: nextcloud/circles
14+
+ ref: ${{ matrix.server-versions }}
15+
+ path: apps/circles
16+
+
17+
- name: Set up php ${{ matrix.php-versions }}
18+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
19+
with:
20+
@@ -160,7 +168,7 @@ jobs:
21+
# Only run if phpunit config file exists
22+
if: steps.check_phpunit.outcome == 'success'
23+
working-directory: apps/${{ env.APP_NAME }}
24+
- run: composer run test:unit
25+
+ run: composer run test:unit -- --no-coverage
26+
27+
- name: Check PHPUnit integration script is defined
28+
id: check_integration
29+
@@ -178,7 +186,7 @@ jobs:
30+
# Only run if phpunit integration config file exists
31+
if: steps.check_integration.outcome == 'success'
32+
working-directory: apps/${{ env.APP_NAME }}
33+
- run: composer run test:integration
34+
+ run: composer run test:integration -- --no-coverage
35+
36+
- name: Print logs
37+
if: always()

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
src: ${{ steps.changes.outputs.src}}
4545

4646
steps:
47-
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
47+
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
4848
id: changes
4949
continue-on-error: true
5050
with:
@@ -68,6 +68,7 @@ jobs:
6868
if: needs.changes.outputs.src != 'false'
6969

7070
strategy:
71+
fail-fast: false
7172
matrix: ${{ fromJson(needs.matrix.outputs.matrix) }}
7273

7374
name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
@@ -134,13 +135,17 @@ jobs:
134135
with:
135136
files: apps/${{ env.APP_NAME }}/composer.json
136137

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

145150
- name: Set up Nextcloud
146151
env:

0 commit comments

Comments
 (0)