Skip to content

Commit 08f2fa2

Browse files
authored
Merge pull request #1115 from nschonni/flatten-skip-duplicate-jobs
chore: flatten ifs for fkirc/skip-duplicate-actions
2 parents 5cf26cc + 5e72aa1 commit 08f2fa2

File tree

2 files changed

+12
-24
lines changed

2 files changed

+12
-24
lines changed

.github/workflows/browser-test.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,18 @@ 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' }}
2324
runs-on: ubuntu-latest
2425
steps:
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
26+
- name: Checkout
2927
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
3028

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

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

.github/workflows/test.yml

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

3232
test:
3333
needs: see_if_should_skip
34+
if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
3435
runs-on: ubuntu-latest
3536
timeout-minutes: 60
3637
strategy:
3738
fail-fast: false
3839
matrix:
3940
test-group: [content, meta, rendering, routing, unit, links-and-images]
4041
steps:
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
42+
- name: Check out repo
4543
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
4644

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

53-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
54-
name: Get npm cache directory
50+
- name: Get npm cache directory
5551
id: npm-cache
5652
run: |
5753
echo "::set-output name=dir::$(npm config get cache)"
5854
59-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
60-
name: Cache node modules
55+
- name: Cache node modules
6156
uses: actions/cache@d1255ad9362389eac595a9ae406b8e8cb3331f16
6257
with:
6358
path: ${{ steps.npm-cache.outputs.dir }}
6459
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
6560
restore-keys: |
6661
${{ runner.os }}-node-
6762
68-
- if: ${{ needs.see_if_should_skip.outputs.should_skip != 'true' }}
69-
name: Install dependencies
63+
- name: Install dependencies
7064
run: npm ci
7165

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

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

0 commit comments

Comments
 (0)