Skip to content

Commit b641069

Browse files
* chore: update workflows from templates
Signed-off-by: Andy Scherzinger <[email protected]>
1 parent dcbade2 commit b641069

File tree

7 files changed

+79
-20
lines changed

7 files changed

+79
-20
lines changed

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,21 @@ jobs:
3232
echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
3333
3434
- name: Checkout
35-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3636
with:
3737
path: ${{ env.APP_NAME }}
3838

39+
- name: Get app version number
40+
id: app-version
41+
uses: skjnldsv/xpath-action@7e6a7c379d0e9abc8acaef43df403ab4fc4f770c # master
42+
with:
43+
filename: ${{ env.APP_NAME }}/appinfo/info.xml
44+
expression: "//info//version/text()"
45+
46+
- name: Validate app version against tag
47+
run: |
48+
[ "${{ env.APP_VERSION }}" = "v${{ fromJSON(steps.app-version.outputs.result).version }}" ]
49+
3950
- name: Get appinfo data
4051
id: appinfo
4152
uses: skjnldsv/xpath-action@7e6a7c379d0e9abc8acaef43df403ab4fc4f770c # master
@@ -56,7 +67,7 @@ jobs:
5667
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
5768
# Skip if no package.json
5869
if: ${{ steps.versions.outputs.nodeVersion }}
59-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
70+
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
6071
with:
6172
node-version: ${{ steps.versions.outputs.nodeVersion }}
6273

@@ -134,7 +145,7 @@ jobs:
134145
unzip latest-$NCVERSION.zip
135146
136147
- name: Checkout server master fallback
137-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
148+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
138149
if: ${{ steps.server-checkout.outcome != 'success' }}
139150
with:
140151
submodules: true

.github/workflows/lint-eslint.yml

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

5757
steps:
5858
- name: Checkout
59-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
59+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6060

6161
- name: Read package.json node and npm engines version
6262
uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
@@ -66,7 +66,7 @@ jobs:
6666
fallbackNpm: '^10'
6767

6868
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
69-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
69+
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
7070
with:
7171
node-version: ${{ steps.versions.outputs.nodeVersion }}
7272

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

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,26 @@
88

99
name: Lint php-cs
1010

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

1332
permissions:
1433
contents: read
@@ -25,24 +44,26 @@ jobs:
2544

2645
steps:
2746
- name: Checkout
28-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
47+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2948

3049
- name: Get php version
3150
id: versions
3251
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
3352

34-
- name: Set up php${{ steps.versions.outputs.php-available }}
53+
- name: Set up php${{ steps.versions.outputs.php-min }}
3554
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
3655
with:
37-
php-version: ${{ steps.versions.outputs.php-available }}
56+
php-version: ${{ steps.versions.outputs.php-min }}
3857
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
3958
coverage: none
4059
ini-file: development
4160
env:
4261
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4362

4463
- name: Install dependencies
45-
run: composer i
64+
run: |
65+
composer remove nextcloud/ocp --dev
66+
composer i
4667
4768
- name: Lint
4869
run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

.github/workflows/node.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
name: NPM build
5454
steps:
5555
- name: Checkout
56-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
56+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5757

5858
- name: Read package.json node and npm engines version
5959
uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3
@@ -63,7 +63,7 @@ jobs:
6363
fallbackNpm: '^10'
6464

6565
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
66-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
66+
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
6767
with:
6868
node-version: ${{ steps.versions.outputs.nodeVersion }}
6969

@@ -78,7 +78,7 @@ jobs:
7878
npm ci
7979
npm run build --if-present
8080
81-
- name: Check build changes
81+
- name: Check webpack build changes
8282
run: |
8383
bash -c "[[ ! \"`git status --porcelain `\" ]] || (echo 'Please recompile and commit the assets, see the section \"Show changes on failure\" for details' && exit 1)"
8484

.github/workflows/openapi.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
29+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3030

3131
- name: Get php version
3232
id: php_versions
@@ -60,15 +60,15 @@ jobs:
6060

6161
- name: Set up node ${{ steps.node_versions.outputs.nodeVersion }}
6262
if: ${{ steps.node_versions.outputs.nodeVersion }}
63-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
63+
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
6464
with:
6565
node-version: ${{ steps.node_versions.outputs.nodeVersion }}
6666

6767
- name: Set up npm ${{ steps.node_versions.outputs.npmVersion }}
6868
if: ${{ steps.node_versions.outputs.nodeVersion }}
6969
run: npm i -g 'npm@${{ steps.node_versions.outputs.npmVersion }}'
7070

71-
- name: Install dependencies & build
71+
- name: Install dependencies
7272
if: ${{ steps.node_versions.outputs.nodeVersion }}
7373
env:
7474
CYPRESS_INSTALL_BINARY: 0

.github/workflows/pr-feedback.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,3 @@ jobs:
4949
start-date: '2024-04-30'
5050
exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }}'
5151
exempt-bots: true
52-

.github/workflows/psalm.yml

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,27 @@
88

99
name: Static analysis
1010

11-
on: pull_request
11+
on:
12+
pull_request:
13+
paths:
14+
- .github/workflows/psalm.yml
15+
- appinfo/**
16+
- composer.*
17+
- lib/**
18+
- templates/**
19+
- tests/**
20+
push:
21+
branches:
22+
- main
23+
- stable*
24+
- test
25+
paths:
26+
- .github/workflows/psalm.yml
27+
- appinfo/**
28+
- composer.*
29+
- lib/**
30+
- templates/**
31+
- tests/**
1232

1333
concurrency:
1434
group: psalm-${{ github.head_ref || github.run_id }}
@@ -21,12 +41,15 @@ jobs:
2141
name: static-psalm-analysis
2242
steps:
2343
- name: Checkout
24-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
44+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2545

2646
- name: Get php version
2747
id: versions
2848
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
2949

50+
- name: Check enforcement of minimum PHP version ${{ steps.versions.outputs.php-min }} in psalm.xml
51+
run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml
52+
3053
- name: Set up php${{ steps.versions.outputs.php-available }}
3154
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
3255
with:
@@ -38,7 +61,12 @@ jobs:
3861
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3962

4063
- name: Install dependencies
41-
run: composer i
64+
run: |
65+
composer remove nextcloud/ocp --dev
66+
composer i
67+
68+
- name: Install nextcloud/ocp
69+
run: composer require --dev nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} --ignore-platform-reqs --with-dependencies
4270

4371
- name: Run coding standards check
4472
run: composer run psalm

0 commit comments

Comments
 (0)