Skip to content

Commit 1c1f6ab

Browse files
authored
Merge branch 'main' into stale-exemption
2 parents 790928c + a7fb82d commit 1c1f6ab

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

.github/workflows/browser-test.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,22 @@ jobs:
2020
paths: '[".github/workflows/browser-test.yml","assets/**", "content/**", "data/**", "includes/**", "javascripts/**", "jest-puppeteer.config.js", "jest.config.js", "layouts/**", "lib/**", "middleware/**", "package-lock.json", "package.json", "server.js", "translations/**", "webpack.config.js"]'
2121
build:
2222
needs: see_if_should_skip
23-
if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
2423
runs-on: ubuntu-latest
2524
steps:
26-
- name: Checkout
25+
# Each of these ifs needs to be repeated at each step to make sure the required check still runs
26+
# Even if if doesn't do anything
27+
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
28+
name: Checkout
2729
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
2830

29-
- name: Install
31+
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
32+
name: Install
3033
uses: ianwalter/puppeteer@12728ddef82390d1ecd4732fb543f62177392fbb
3134
with:
3235
args: npm ci
3336

34-
- name: Test
37+
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
38+
name: Test
3539
uses: ianwalter/puppeteer@12728ddef82390d1ecd4732fb543f62177392fbb
3640
with:
3741
args: npm run browser-test

.github/workflows/test.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,42 +31,50 @@ jobs:
3131

3232
test:
3333
needs: see_if_should_skip
34-
if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
3534
runs-on: ubuntu-latest
3635
timeout-minutes: 60
3736
strategy:
3837
fail-fast: false
3938
matrix:
4039
test-group: [content, meta, rendering, routing, unit, links-and-images]
4140
steps:
42-
- name: Check out repo
41+
# Each of these ifs needs to be repeated at each step to make sure the required check still runs
42+
# Even if if doesn't do anything
43+
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
44+
name: Check out repo
4345
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
4446

45-
- name: Setup node
47+
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
48+
name: Setup node
4649
uses: actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d
4750
with:
4851
node-version: 14.x
4952

50-
- name: Get npm cache directory
53+
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
54+
name: Get npm cache directory
5155
id: npm-cache
5256
run: |
5357
echo "::set-output name=dir::$(npm config get cache)"
5458
55-
- name: Cache node modules
59+
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
60+
name: Cache node modules
5661
uses: actions/cache@0781355a23dac32fd3bac414512f4b903437991a
5762
with:
5863
path: ${{ steps.npm-cache.outputs.dir }}
5964
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
6065
restore-keys: |
6166
${{ runner.os }}-node-
6267
63-
- name: Install dependencies
68+
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
69+
name: Install dependencies
6470
run: npm ci
6571

66-
- name: Run build script
72+
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
73+
name: Run build script
6774
run: npm run build
6875

69-
- name: Run tests
76+
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
77+
name: Run tests
7078
run: npx jest tests/${{ matrix.test-group }}/
7179
env:
7280
NODE_OPTIONS: "--max_old_space_size=4096"

0 commit comments

Comments
 (0)