Skip to content

Commit 3120e36

Browse files
committed
ci: refactor test.yml
1 parent ae105fb commit 3120e36

File tree

1 file changed

+50
-8
lines changed

1 file changed

+50
-8
lines changed

.github/workflows/test.yml

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,33 @@ on:
1212

1313
jobs:
1414
lint:
15+
name: Lint
1516
runs-on: ubuntu-latest
1617
steps:
17-
- uses: actions/checkout@master
18-
- uses: actions/setup-node@v1
18+
- name: Checkout
19+
uses: actions/checkout@master
20+
- name: Setup node
21+
uses: actions/setup-node@v2-beta
1922
with:
2023
node-version: 12
21-
- run: npx panva/npm-install-retry
24+
- name: Store node version variable
25+
id: node
26+
run: |
27+
echo "::set-output name=version::$(node -v)"
28+
- name: Cache node_modules
29+
uses: actions/cache@v2
30+
id: node_modules
31+
with:
32+
path: node_modules
33+
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package.json') }}-${{ steps.node.outputs.version }}
34+
- name: Install dependencies
35+
run: npx panva/npm-install-retry
36+
if: ${{ steps.node_modules.outputs.cache-hit != 'true' }}
2237
- run: npm run lint
2338
- run: npm run lint-ts
2439

2540
test:
41+
name: Node Tests + Coverage
2642
runs-on: ${{ matrix.os }}
2743
strategy:
2844
matrix:
@@ -40,11 +56,25 @@ jobs:
4056
- windows-latest
4157
- macOS-latest
4258
steps:
43-
- uses: actions/checkout@master
44-
- uses: actions/setup-node@v1
59+
- name: Checkout
60+
uses: actions/checkout@master
61+
- name: Setup node
62+
uses: actions/setup-node@v2-beta
4563
with:
4664
node-version: ${{ matrix.node-version }}
47-
- run: npx panva/npm-install-retry
65+
- name: Store node version variable
66+
id: node
67+
run: |
68+
echo "::set-output name=version::$(node -v)"
69+
- name: Cache node_modules
70+
uses: actions/cache@v2
71+
id: node_modules
72+
with:
73+
path: node_modules
74+
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package.json') }}-${{ steps.node.outputs.version }}
75+
- name: Install dependencies
76+
run: npx panva/npm-install-retry
77+
if: ${{ steps.node_modules.outputs.cache-hit != 'true' }}
4878
- run: npm run coverage
4979
- env:
5080
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -72,7 +102,19 @@ jobs:
72102
- uses: actions/setup-node@v1
73103
with:
74104
node-version: 12
75-
- run: npx panva/npm-install-retry
105+
- name: Store node version variable
106+
id: node
107+
run: |
108+
echo "::set-output name=version::$(node -v)"
109+
- name: Cache node_modules
110+
uses: actions/cache@v2
111+
id: node_modules
112+
with:
113+
path: node_modules
114+
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package.json') }}-${{ steps.node.outputs.version }}
115+
- name: Install dependencies
116+
run: npx panva/npm-install-retry
117+
if: ${{ steps.node_modules.outputs.cache-hit != 'true' }}
76118
- run: npx xvfb-maybe npx electron@${{ matrix.electron-version }} ./test/electron test/**/*.test.js
77119

78120
oidc-conformance:
@@ -101,7 +143,7 @@ jobs:
101143
- env:
102144
MAVEN_CACHE: ./m2
103145
run: |
104-
git checkout release-v4.0.0
146+
git checkout release-v4.0.10
105147
sed -i -e 's/localhost/localhost.emobix.co.uk/g' src/main/resources/application.properties
106148
sed -i -e 's/-B/-B -DskipTests=true/g' builder-compose.yml
107149
docker-compose -f builder-compose.yml run builder

0 commit comments

Comments
 (0)