Skip to content

Commit 55771f3

Browse files
committed
chore: update workflows from templates
Signed-off-by: skjnldsv <[email protected]>
1 parent 3e29e65 commit 55771f3

File tree

4 files changed

+83
-78
lines changed

4 files changed

+83
-78
lines changed

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

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
#
33
# https://github.com/nextcloud/.github
44
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
#
6+
# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
7+
# SPDX-License-Identifier: MIT
58

69
name: Build and publish app release
710

811
on:
912
release:
1013
types: [published]
1114

12-
env:
13-
PHP_VERSION: 8.1
14-
1515
jobs:
1616
build_and_publish:
1717
runs-on: ubuntu-latest
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Check actor permission
24-
uses: skjnldsv/check-actor-permission@e591dbfe838300c007028e1219ca82cc26e8d7c5 # v2.1
24+
uses: skjnldsv/check-actor-permission@69e92a3c4711150929bca9fcf34448c5bf5526e7 # v3.0
2525
with:
2626
require: write
2727

@@ -32,7 +32,7 @@ jobs:
3232
echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
3333
3434
- name: Checkout
35-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
35+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3636
with:
3737
path: ${{ env.APP_NAME }}
3838

@@ -44,38 +44,44 @@ jobs:
4444
expression: "//info//dependencies//nextcloud/@min-version"
4545

4646
- name: Read package.json node and npm engines version
47-
uses: skjnldsv/read-package-engines-version-actions@0ce2ed60f6df073a62a77c0a4958dd0fc68e32e7 # v2.1
47+
uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
4848
id: versions
4949
# Continue if no package.json
5050
continue-on-error: true
5151
with:
5252
path: ${{ env.APP_NAME }}
53-
fallbackNode: "^16"
54-
fallbackNpm: "^7"
53+
fallbackNode: '^20'
54+
fallbackNpm: '^10'
5555

5656
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
5757
# Skip if no package.json
5858
if: ${{ steps.versions.outputs.nodeVersion }}
59-
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
59+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
6060
with:
6161
node-version: ${{ steps.versions.outputs.nodeVersion }}
6262

6363
- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
6464
# Skip if no package.json
6565
if: ${{ steps.versions.outputs.npmVersion }}
66-
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
66+
run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}'
67+
68+
- name: Get php version
69+
id: php-versions
70+
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
71+
with:
72+
filename: ${{ env.APP_NAME }}/appinfo/info.xml
6773

68-
- name: Set up php ${{ env.PHP_VERSION }}
69-
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
74+
- name: Set up php ${{ steps.php-versions.outputs.php-min }}
75+
uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
7076
with:
71-
php-version: ${{ env.PHP_VERSION }}
77+
php-version: ${{ steps.php-versions.outputs.php-min }}
7278
coverage: none
7379
env:
7480
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7581

7682
- name: Check composer.json
7783
id: check_composer
78-
uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
84+
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
7985
with:
8086
files: "${{ env.APP_NAME }}/composer.json"
8187

@@ -88,14 +94,16 @@ jobs:
8894
- name: Build ${{ env.APP_NAME }}
8995
# Skip if no package.json
9096
if: ${{ steps.versions.outputs.nodeVersion }}
97+
env:
98+
NODE_ENV: production
9199
run: |
92100
cd ${{ env.APP_NAME }}
93101
npm ci
94-
npm run build
102+
npm run build --if-present
95103
96104
- name: Check Krankerl config
97105
id: krankerl
98-
uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2
106+
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
99107
with:
100108
files: ${{ env.APP_NAME }}/krankerl.toml
101109

@@ -121,12 +129,12 @@ jobs:
121129
continue-on-error: true
122130
id: server-checkout
123131
run: |
124-
NCVERSION=${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}
132+
NCVERSION='${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}'
125133
wget --quiet https://download.nextcloud.com/server/releases/latest-$NCVERSION.zip
126134
unzip latest-$NCVERSION.zip
127135
128136
- name: Checkout server master fallback
129-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
137+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
130138
if: ${{ steps.server-checkout.outcome != 'success' }}
131139
with:
132140
submodules: true
@@ -140,7 +148,7 @@ jobs:
140148
tar -xvf ${{ env.APP_NAME }}.tar.gz
141149
cd ../../../
142150
# Setting up keys
143-
echo "${{ secrets.APP_PRIVATE_KEY }}" > ${{ env.APP_NAME }}.key
151+
echo '${{ secrets.APP_PRIVATE_KEY }}' > ${{ env.APP_NAME }}.key
144152
wget --quiet "https://github.com/nextcloud/app-certificate-requests/raw/master/${{ env.APP_NAME }}/${{ env.APP_NAME }}.crt"
145153
# Signing
146154
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 }}
@@ -149,7 +157,7 @@ jobs:
149157
tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
150158
151159
- name: Attach tarball to github release
152-
uses: svenstaro/upload-release-action@2b9d2847a97b04d02ad5c3df2d3a27baa97ce689 # v2
160+
uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # v2
153161
id: attach_to_release
154162
with:
155163
repo_token: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,13 @@
22
#
33
# https://github.com/nextcloud/.github
44
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
#
6+
# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
7+
# SPDX-License-Identifier: MIT
58

69
name: Lint php-cs
710

8-
on:
9-
push:
10-
branches: [ main, test ]
11-
paths:
12-
- 'lib/**'
13-
- 'templates/**'
14-
- 'tests/**'
15-
- 'vendor/**'
16-
- 'vendor-bin/**'
17-
- composer.lock
18-
- composer.json
19-
pull_request:
20-
paths:
21-
- 'lib/**'
22-
- 'templates/**'
23-
- 'tests/**'
24-
- 'vendor/**'
25-
- 'vendor-bin/**'
26-
- composer.lock
27-
- composer.json
11+
on: pull_request
2812

2913
permissions:
3014
contents: read
@@ -41,12 +25,17 @@ jobs:
4125

4226
steps:
4327
- name: Checkout
44-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
28+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
29+
30+
- name: Get php version
31+
id: versions
32+
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
4533

46-
- name: Set up php
47-
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
34+
- name: Set up php${{ steps.versions.outputs.php-available }}
35+
uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
4836
with:
49-
php-version: 8.2
37+
php-version: ${{ steps.versions.outputs.php-available }}
38+
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
5039
coverage: none
5140
ini-file: development
5241
env:

.github/workflows/pr-feedback.yml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,50 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
6+
# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
7+
# SPDX-FileCopyrightText: 2023 Marcel Klehr <[email protected]>
8+
# SPDX-FileCopyrightText: 2023 Joas Schilling <[email protected]>
9+
# SPDX-FileCopyrightText: 2023 Daniel Kesselberg <[email protected]>
10+
# SPDX-FileCopyrightText: 2023 Florian Steffens <[email protected]>
11+
# SPDX-License-Identifier: MIT
12+
113
name: 'Ask for feedback on PRs'
214
on:
315
schedule:
416
- cron: '30 1 * * *'
517

618
jobs:
719
pr-feedback:
8-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-latest
921
steps:
1022
- name: The get-github-handles-from-website action
1123
uses: marcelklehr/get-github-handles-from-website-action@a739600f6b91da4957f51db0792697afbb2f143c # v1.0.0
1224
id: scrape
1325
with:
1426
website: 'https://nextcloud.com/team/'
15-
- uses: marcelklehr/pr-feedback-action@601109aa729eb4c8d6d0ece7567b9d4901db4aef
27+
28+
- name: Get blocklist
29+
id: blocklist
30+
run: |
31+
blocklist=$(curl https://raw.githubusercontent.com/nextcloud/.github/master/non-community-usernames.txt | paste -s -d, -)
32+
echo "blocklist=$blocklist" >> "$GITHUB_OUTPUT"
33+
34+
- uses: marcelklehr/pr-feedback-action@1883b38a033fb16f576875e0cf45f98b857655c4
1635
with:
1736
feedback-message: |
1837
Hello there,
19-
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.
38+
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.
2039
2140
We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.
2241
2342
Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6
2443
2544
Thank you for contributing to Nextcloud and we hope to hear from you soon!
45+
46+
(If you believe you should not receive this message, you can add yourself to the [blocklist](https://github.com/nextcloud/.github/blob/master/non-community-usernames.txt).)
2647
days-before-feedback: 14
27-
start-date: "2023-07-10"
28-
exempt-authors: "${{ steps.scrape.outputs.users }},nextcloud-command"
48+
start-date: '2024-04-30'
49+
exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }},nextcloud-command,nextcloud-android-bot'
2950
exempt-bots: true

.github/workflows/psalm.yml

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,13 @@
22
#
33
# https://github.com/nextcloud/.github
44
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
#
6+
# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
7+
# SPDX-License-Identifier: MIT
8+
9+
name: Static analysis
510

6-
name: Psalm static analysis
7-
8-
on:
9-
pull_request:
10-
paths:
11-
- .github/workflows/psalm.yml
12-
- appinfo/**
13-
- composer.*
14-
- lib/**
15-
- templates/**
16-
- tests/**
17-
push:
18-
branches:
19-
- main
20-
- stable*
21-
- test
22-
paths:
23-
- .github/workflows/psalm.yml
24-
- appinfo/**
25-
- composer.*
26-
- lib/**
27-
- templates/**
28-
- tests/**
11+
on: pull_request
2912

3013
concurrency:
3114
group: psalm-${{ github.head_ref || github.run_id }}
@@ -35,18 +18,22 @@ jobs:
3518
static-analysis:
3619
runs-on: ubuntu-latest
3720

38-
name: Psalm check
21+
name: static-psalm-analysis
3922
steps:
4023
- name: Checkout
41-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
24+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
25+
26+
- name: Get php version
27+
id: versions
28+
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
4229

43-
- name: Set up php
44-
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
30+
- name: Set up php${{ steps.versions.outputs.php-available }}
31+
uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0
4532
with:
46-
php-version: 8.2
33+
php-version: ${{ steps.versions.outputs.php-available }}
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
4735
coverage: none
4836
ini-file: development
49-
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, gd, zip
5037
env:
5138
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5239

0 commit comments

Comments
 (0)