Skip to content

Commit dd874fe

Browse files
committed
chore: update workflows from templates
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
1 parent 9e51322 commit dd874fe

10 files changed

Lines changed: 56 additions & 36 deletions

.github/workflows/block-merge-freeze.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@ jobs:
2222

2323
if: github.event.pull_request.draft == false
2424

25-
runs-on: ubuntu-latest
25+
runs-on: ubuntu-latest-low
2626

2727
steps:
28-
- name: Download version.php from ${{ github.base_ref }}
29-
run: curl https://raw.githubusercontent.com/nextcloud/server/${{ github.base_ref }}/version.php --output version.php
28+
- name: Register server reference to fallback to master branch
29+
run: |
30+
server_ref="$(if [ "${{ github.base_ref }}" = "main" ]; then echo -n "master"; else echo -n "${{ github.base_ref }}"; fi)"
31+
echo "server_ref=$server_ref" >> $GITHUB_ENV
32+
- name: Download version.php from ${{ env.server_ref }}
33+
run: curl https://raw.githubusercontent.com/nextcloud/server/${{ env.server_ref }}/version.php --output version.php
3034

3135
- name: Run check
3236
run: cat version.php | grep 'OC_VersionString' | grep -i -v 'RC'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ concurrency:
2222
jobs:
2323
auto-approve-merge:
2424
if: github.actor == 'dependabot[bot]'
25-
runs-on: ubuntu-latest
25+
runs-on: ubuntu-latest-low
2626
permissions:
2727
# for hmarr/auto-approve-action to approve PRs
2828
pull-requests: write

.github/workflows/lint-eslint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ concurrency:
1919

2020
jobs:
2121
changes:
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-latest-low
2323

2424
outputs:
2525
src: ${{ steps.changes.outputs.src}}
2626

2727
steps:
28-
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
28+
- uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
2929
id: changes
3030
continue-on-error: true
3131
with:
@@ -60,10 +60,10 @@ jobs:
6060
id: versions
6161
with:
6262
fallbackNode: '^20'
63-
fallbackNpm: '^9'
63+
fallbackNpm: '^10'
6464

6565
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
66-
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v3
66+
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v3
6767
with:
6868
node-version: ${{ steps.versions.outputs.nodeVersion }}
6969

@@ -82,7 +82,7 @@ jobs:
8282
summary:
8383
permissions:
8484
contents: none
85-
runs-on: ubuntu-latest
85+
runs-on: ubuntu-latest-low
8686
needs: [changes, lint]
8787

8888
if: always()

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

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

2727
- name: Set up php8.2
28-
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
28+
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2
2929
with:
3030
php-version: 8.2
31+
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
3132
coverage: none
3233
ini-file: development
3334
env:

.github/workflows/lint-php.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2929

3030
- name: Set up php ${{ matrix.php-versions }}
31-
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
31+
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2
3232
with:
3333
php-version: ${{ matrix.php-versions }}
34+
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
3435
coverage: none
3536
ini-file: development
3637
env:
@@ -42,7 +43,7 @@ jobs:
4243
summary:
4344
permissions:
4445
contents: none
45-
runs-on: ubuntu-latest
46+
runs-on: ubuntu-latest-low
4647
needs: php-lint
4748

4849
if: always()

.github/workflows/node-test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ concurrency:
1717

1818
jobs:
1919
changes:
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-latest-low
2121

2222
outputs:
2323
src: ${{ steps.changes.outputs.src}}
2424

2525
steps:
26-
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
26+
- uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
2727
id: changes
2828
continue-on-error: true
2929
with:
@@ -56,10 +56,10 @@ jobs:
5656
id: versions
5757
with:
5858
fallbackNode: '^20'
59-
fallbackNpm: '^9'
59+
fallbackNpm: '^10'
6060

6161
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
62-
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
62+
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
6363
with:
6464
node-version: ${{ steps.versions.outputs.nodeVersion }}
6565

@@ -80,14 +80,14 @@ jobs:
8080
run: npm run test:coverage --if-present
8181

8282
- name: Collect coverage
83-
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
83+
uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
8484
with:
8585
files: ./coverage/lcov.info
8686

8787
summary:
8888
permissions:
8989
contents: none
90-
runs-on: ubuntu-latest
90+
runs-on: ubuntu-latest-low
9191
needs: [changes, test]
9292

9393
if: always()

.github/workflows/node.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ concurrency:
1616

1717
jobs:
1818
changes:
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-latest-low
2020

2121
outputs:
2222
src: ${{ steps.changes.outputs.src}}
2323

2424
steps:
25-
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
25+
- uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
2626
id: changes
2727
continue-on-error: true
2828
with:
@@ -54,10 +54,10 @@ jobs:
5454
id: versions
5555
with:
5656
fallbackNode: '^20'
57-
fallbackNpm: '^9'
57+
fallbackNpm: '^10'
5858

5959
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
60-
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v3
60+
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v3
6161
with:
6262
node-version: ${{ steps.versions.outputs.nodeVersion }}
6363

@@ -86,7 +86,7 @@ jobs:
8686
summary:
8787
permissions:
8888
contents: none
89-
runs-on: ubuntu-latest
89+
runs-on: ubuntu-latest-low
9090
needs: [changes, build]
9191

9292
if: always()

.github/workflows/phpunit-sqlite.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,27 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
jobs:
18+
matrix:
19+
runs-on: ubuntu-latest-low
20+
outputs:
21+
php-max: ${{ steps.versions.outputs.php-max-list }}
22+
server-max: ${{ steps.versions.outputs.branches-max-list }}
23+
steps:
24+
- name: Checkout app
25+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
26+
27+
- name: Get version matrix
28+
id: versions
29+
uses: icewind1991/nextcloud-version-matrix@d594a6929da316b732c53355e52a1ead77ba36c7 # v1.2.0
30+
1831
changes:
19-
runs-on: ubuntu-latest
32+
runs-on: ubuntu-latest-low
2033

2134
outputs:
2235
src: ${{ steps.changes.outputs.src}}
2336

2437
steps:
25-
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
38+
- uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
2639
id: changes
2740
continue-on-error: true
2841
with:
@@ -42,13 +55,13 @@ jobs:
4255
phpunit-sqlite:
4356
runs-on: ubuntu-latest
4457

45-
needs: changes
58+
needs: [changes, matrix]
4659
if: needs.changes.outputs.src != 'false'
4760

4861
strategy:
4962
matrix:
50-
php-versions: ['8.2']
51-
server-versions: ['master']
63+
php-versions: ${{ fromJson(needs.matrix.outputs.php-max) }}
64+
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
5265

5366
steps:
5467
- name: Set app env
@@ -69,7 +82,7 @@ jobs:
6982
path: apps/${{ env.APP_NAME }}
7083

7184
- name: Set up php ${{ matrix.php-versions }}
72-
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
85+
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2
7386
with:
7487
php-version: ${{ matrix.php-versions }}
7588
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -81,7 +94,7 @@ jobs:
8194

8295
- name: Check composer file existence
8396
id: check_composer
84-
uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
97+
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v2
8598
with:
8699
files: apps/${{ env.APP_NAME }}/composer.json
87100

@@ -145,7 +158,7 @@ jobs:
145158
summary:
146159
permissions:
147160
contents: none
148-
runs-on: ubuntu-latest
161+
runs-on: ubuntu-latest-low
149162
needs: [changes, phpunit-sqlite]
150163

151164
if: always()

.github/workflows/psalm-matrix.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,18 @@ jobs:
1818
# do not stop on another job's failure
1919
fail-fast: false
2020
matrix:
21-
ocp-version: [ 'dev-master' ]
21+
ocp-version: [ 'dev-master', 'dev-stable28', 'dev-stable27', 'dev-stable26' ]
2222

2323
name: static-psalm-analysis ${{ matrix.ocp-version }}
2424
steps:
2525
- name: Checkout
2626
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2727

2828
- name: Set up php8.2
29-
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
29+
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2
3030
with:
3131
php-version: 8.2
32+
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
3233
coverage: none
3334
ini-file: development
3435
env:
@@ -44,7 +45,7 @@ jobs:
4445
run: composer run psalm
4546

4647
summary:
47-
runs-on: ubuntu-latest
48+
runs-on: ubuntu-latest-low
4849
needs: static-analysis
4950

5051
if: always()

.github/workflows/update-nextcloud-ocp.yml

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

3232
- name: Set up php8.2
3333
if: steps.checkout.outcome == 'success'
34-
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2
34+
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # v2
3535
with:
3636
php-version: 8.2
3737
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -100,7 +100,7 @@ jobs:
100100

101101
- name: Create Pull Request
102102
if: steps.checkout.outcome == 'success'
103-
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v3
103+
uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v3
104104
with:
105105
token: ${{ secrets.COMMAND_BOT_PAT }}
106106
commit-message: "chore(dev-deps): Bump nextcloud/ocp package"

0 commit comments

Comments
 (0)