Skip to content

Commit 224c593

Browse files
committed
chore: update workflows from templates
Signed-off-by: John Molakvoæ <[email protected]> Signed-off-by: Louis Chemineau <[email protected]>
1 parent 05c74b8 commit 224c593

File tree

13 files changed

+35
-41
lines changed

13 files changed

+35
-41
lines changed

.github/workflows/cypress.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
name: Cypress
22

3-
on:
4-
pull_request:
5-
push:
6-
branches:
7-
- main
8-
- master
9-
- stable*
3+
on: pull_request
4+
5+
concurrency:
6+
group: cypress-${{ github.head_ref || github.run_id }}
7+
cancel-in-progress: true
108

119
env:
1210
# Adjust APP_NAME if your repository name is different
@@ -25,9 +23,12 @@ jobs:
2523
nodeVersion: ${{ steps.versions.outputs.nodeVersion }}
2624
npmVersion: ${{ steps.versions.outputs.npmVersion }}
2725

26+
env:
27+
PUPPETEER_SKIP_DOWNLOAD: true
28+
2829
steps:
2930
- name: Checkout app
30-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
31+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3132

3233
- name: Check composer.json
3334
id: check_composer
@@ -40,14 +41,14 @@ jobs:
4041
run: composer install --no-dev
4142

4243
- name: Read package.json node and npm engines version
43-
uses: skjnldsv/read-package-engines-version-actions@0ce2ed60f6df073a62a77c0a4958dd0fc68e32e7 # v2.1
44+
uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
4445
id: versions
4546
with:
4647
fallbackNode: "^20"
4748
fallbackNpm: "^9"
4849

4950
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
50-
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
51+
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
5152
with:
5253
node-version: ${{ steps.versions.outputs.nodeVersion }}
5354

@@ -74,7 +75,7 @@ jobs:
7475
matrix:
7576
# Run multiple copies of the current job in parallel
7677
# Please increase the number or runners as your tests suite grows
77-
containers: [1, 2]
78+
containers: ["component", 1, 2, 3]
7879

7980
name: runner ${{ matrix.containers }}
8081

@@ -87,15 +88,15 @@ jobs:
8788
path: ./
8889

8990
- name: Set up node ${{ needs.init.outputs.nodeVersion }}
90-
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
91+
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
9192
with:
9293
node-version: ${{ needs.init.outputs.nodeVersion }}
9394

9495
- name: Set up npm ${{ needs.init.outputs.npmVersion }}
9596
run: npm i -g npm@"${{ needs.init.outputs.npmVersion }}"
9697

9798
- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
98-
uses: cypress-io/github-action@db1693016f23ccf9043f4b2428f9b04e5d502a73 # v5.8.1
99+
uses: cypress-io/github-action@ebe8b24c4428922d0f793a5c4c96853a633180e3 # v6.6.0
99100
with:
100101
record: true
101102
parallel: true
@@ -116,7 +117,7 @@ jobs:
116117
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
117118

118119
- name: Upload snapshots
119-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
120+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
120121
if: always()
121122
with:
122123
name: snapshots_${{ matrix.containers }}
@@ -127,7 +128,7 @@ jobs:
127128
run: docker logs nextcloud-cypress-tests-${{ env.APP_NAME }} > nextcloud.log
128129

129130
- name: Upload NC logs
130-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
131+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
131132
if: failure() && matrix.containers != 'component'
132133
with:
133134
name: nc_logs_${{ matrix.containers }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2626

2727
- name: Set up php8.2
28-
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
28+
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
2929
with:
3030
php-version: 8.2
3131
coverage: none

.github/workflows/lint-php.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2929

3030
- name: Set up php ${{ matrix.php-versions }}
31-
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
31+
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
3232
with:
3333
php-version: ${{ matrix.php-versions }}
3434
coverage: none

.github/workflows/node-test.yml

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

7979
- name: Test and process coverage
8080
run: npm run test:coverage --if-present
81-
81+
8282
- name: Collect coverage
8383
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
8484
with:

.github/workflows/node.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,6 @@ jobs:
8383
git --no-pager diff
8484
exit 1 # make it red to grab attention
8585
86-
- name: Upload assets for debugging
87-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
88-
if: failure()
89-
with:
90-
name: assets
91-
path: js/
92-
9386
summary:
9487
permissions:
9588
contents: none

.github/workflows/npm-audit-fix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
branches: ['main', 'master', 'stable28', 'stable27', 'stable26']
22-
22+
2323
name: npm-audit-fix-${{ matrix.branches }}
2424

2525
steps:

.github/workflows/phpunit-mariadb.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
matrix:
5050
php-versions: ['8.2']
5151
mariadb-versions: ['10.6', '10.11']
52-
server-versions: ['stable28']
52+
server-versions: ['master']
5353

5454
name: MariaDB ${{ matrix.mariadb-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
5555

@@ -81,7 +81,7 @@ jobs:
8181
path: apps/${{ env.APP_NAME }}
8282

8383
- name: Set up php ${{ matrix.php-versions }}
84-
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
84+
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
8585
with:
8686
php-version: ${{ matrix.php-versions }}
8787
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/phpunit-mysql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
strategy:
4949
matrix:
5050
php-versions: ['8.0', '8.1', '8.2', '8.3']
51-
server-versions: ['stable28']
51+
server-versions: ['master']
5252
mysql-versions: ['8.1']
5353

5454
name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
@@ -81,7 +81,7 @@ jobs:
8181
path: apps/${{ env.APP_NAME }}
8282

8383
- name: Set up php ${{ matrix.php-versions }}
84-
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
84+
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
8585
with:
8686
php-version: ${{ matrix.php-versions }}
8787
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/phpunit-oci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
strategy:
4949
matrix:
5050
php-versions: ['8.2']
51-
server-versions: ['stable28']
51+
server-versions: ['master']
5252

5353
services:
5454
oracle:
@@ -90,7 +90,7 @@ jobs:
9090
path: apps/${{ env.APP_NAME }}
9191

9292
- name: Set up php ${{ matrix.php-versions }}
93-
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
93+
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
9494
with:
9595
php-version: ${{ matrix.php-versions }}
9696
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/phpunit-pgsql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
strategy:
4949
matrix:
5050
php-versions: ['8.2']
51-
server-versions: ['stable28']
51+
server-versions: ['master']
5252

5353
services:
5454
postgres:
@@ -80,7 +80,7 @@ jobs:
8080
path: apps/${{ env.APP_NAME }}
8181

8282
- name: Set up php ${{ matrix.php-versions }}
83-
uses: shivammathur/setup-php@81cd5ae0920b34eef300e1775313071038a53429 # v2
83+
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
8484
with:
8585
php-version: ${{ matrix.php-versions }}
8686
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

0 commit comments

Comments
 (0)