Skip to content

Commit c780834

Browse files
skjnldsvskjnldsv
authored
Merge pull request #497 from nextcloud/fix/node-workflow
[stable21] Update workflows
2 parents 09dc37a + 89d7843 commit c780834

File tree

3 files changed

+97
-44
lines changed

3 files changed

+97
-44
lines changed

‎.github/workflows/fixup.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
name: Pull request checks
7+
8+
on: pull_request
9+
10+
jobs:
11+
commit-message-check:
12+
name: Block fixup and squash commits
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Run check
18+
uses: xt0rted/block-autosquash-commits-action@v2
19+
with:
20+
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/lint.yml‎

Lines changed: 49 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
php-versions: ['7.3', '7.4']
17-
16+
php-versions: ["7.3", "7.4"]
17+
1818
name: php${{ matrix.php-versions }}
1919
steps:
20-
- uses: actions/checkout@v2
20+
- name: Checkout
21+
uses: actions/checkout@v2
2122

2223
- name: Set up php ${{ matrix.php-versions }}
23-
uses: shivammathur/setup-php@v1
24+
uses: shivammathur/setup-php@v2
2425
with:
2526
php-version: ${{ matrix.php-versions }}
2627
coverage: none
@@ -33,40 +34,47 @@ jobs:
3334

3435
strategy:
3536
matrix:
36-
php-versions: ['7.4']
37+
php-versions: ["7.4"]
3738

3839
name: cs php${{ matrix.php-versions }}
3940
steps:
40-
- name: Checkout
41-
uses: actions/checkout@v2
41+
- name: Checkout
42+
uses: actions/checkout@v2
4243

43-
- name: Set up php
44-
uses: shivammathur/setup-php@master
45-
with:
46-
php-version: ${{ matrix.php-versions }}
47-
coverage: none
44+
- name: Set up php
45+
uses: shivammathur/setup-php@v2
46+
with:
47+
php-version: ${{ matrix.php-versions }}
48+
coverage: none
4849

49-
- name: Install dependencies
50-
run: composer i
50+
- name: Install dependencies
51+
run: composer i
5152

52-
- name: Run coding standards check
53-
run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
53+
- name: Run coding standards check
54+
run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
5455

5556
node:
5657
runs-on: ubuntu-latest
5758

58-
strategy:
59-
matrix:
60-
node-version: [12.x]
61-
62-
name: eslint node${{ matrix.node-version }}
59+
name: eslint node
6360
steps:
64-
- uses: actions/checkout@v2
61+
- name: Checkout
62+
uses: actions/checkout@v2
6563

66-
- name: Set up node ${{ matrix.node-version }}
67-
uses: actions/setup-node@v1
64+
- name: Read package.json node and npm engines version
65+
uses: skjnldsv/read-package-engines-version-actions@v1.1
66+
id: versions
6867
with:
69-
node-version: ${{ matrix.node-version }}
68+
fallbackNode: '^12'
69+
fallbackNpm: '^6'
70+
71+
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
72+
uses: actions/setup-node@v2
73+
with:
74+
node-version: ${{ steps.versions.outputs.nodeVersion }}
75+
76+
- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
77+
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
7078

7179
- name: Install dependencies
7280
run: npm ci
@@ -77,18 +85,25 @@ jobs:
7785
stylelint:
7886
runs-on: ubuntu-latest
7987

80-
strategy:
81-
matrix:
82-
node-version: [12.x]
83-
84-
name: stylelint node${{ matrix.node-version }}
88+
name: stylelint node
8589
steps:
86-
- uses: actions/checkout@v2
90+
- name: Checkout
91+
uses: actions/checkout@v2
92+
93+
- name: Read package.json node and npm engines version
94+
uses: skjnldsv/read-package-engines-version-actions@v1.1
95+
id: versions
96+
with:
97+
fallbackNode: '^12'
98+
fallbackNpm: '^6'
8799

88-
- name: Set up node ${{ matrix.node-version }}
89-
uses: actions/setup-node@v1
100+
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
101+
uses: actions/setup-node@v2
90102
with:
91-
node-version: ${{ matrix.node-version }}
103+
node-version: ${{ steps.versions.outputs.nodeVersion }}
104+
105+
- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
106+
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
92107

93108
- name: Install dependencies
94109
run: npm ci

‎.github/workflows/node.yml‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
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+
16
name: Node
27

38
on:
@@ -11,18 +16,25 @@ jobs:
1116
build:
1217
runs-on: ubuntu-latest
1318

14-
strategy:
15-
matrix:
16-
node-version: [12.x]
17-
18-
name: node${{ matrix.node-version }}
19+
name: node
1920
steps:
20-
- uses: actions/checkout@v2
21+
- name: Checkout
22+
uses: actions/checkout@v2
23+
24+
- name: Read package.json node and npm engines version
25+
uses: skjnldsv/read-package-engines-version-actions@v1.1
26+
id: versions
27+
with:
28+
fallbackNode: '^12'
29+
fallbackNpm: '^6'
2130

22-
- name: Set up node ${{ matrix.node-version }}
23-
uses: actions/setup-node@v1
31+
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
32+
uses: actions/setup-node@v2
2433
with:
25-
node-version: ${{ matrix.node-version }}
34+
node-version: ${{ steps.versions.outputs.nodeVersion }}
35+
36+
- name: Set up npm ${{ steps.versions.outputs.npmVersion }}
37+
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
2638

2739
- name: Install dependencies & build
2840
run: |
@@ -31,4 +43,10 @@ jobs:
3143
3244
- name: Check webpack build changes
3345
run: |
34-
bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && git status && exit 1 )"
46+
bash -c "[[ ! \"`git status --porcelain `\" ]] || exit 1"
47+
48+
- name: Show changes on failure
49+
if: failure()
50+
run: |
51+
git status
52+
git --no-pager diff

0 commit comments

Comments
 (0)