Skip to content

Commit a30dee2

Browse files
cjyarleeroy-travis
andauthored
Workflow update 2021 07 19 (#61)
* Update workflows from templates. * Adjust patch for revised workflow. Co-authored-by: Leeroy Travis <[email protected]>
1 parent c6fea2f commit a30dee2

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.github/typescript-ci-patch.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
# These steps are lifted from the Rust CI workflow, cargo-test job.
2525
- op: add
26-
path: /jobs/test/steps/3
26+
path: /jobs/test/steps/2
2727
value:
2828
uses: actions-rs/toolchain@v1
2929
with:
@@ -33,17 +33,17 @@
3333

3434
# Modify the yarn actions.
3535
- op: replace
36-
path: /jobs/test/steps/4/run
36+
path: /jobs/test/steps/3/run
3737
value: yarn install --ignore-scripts
3838
- op: add
39-
path: /jobs/test/steps/5
39+
path: /jobs/test/steps/4
4040
value:
4141
name: Compile
4242
run: yarn run compile
4343

4444
# Only check coverage in one of the matrix job instances.
4545
- op: add
46-
path: /jobs/test/steps/7/if
46+
path: /jobs/test/steps/6/if
4747
value: ${{ contains(matrix.os, 'ubuntu') && matrix.node_version == '10' && matrix.rust_version == 'stable' && github.base_ref != '' }}
4848

4949
# Also run on musl. That means we need to run it in a Docker container. To do that, we copy the entire job and modify its
@@ -72,7 +72,7 @@
7272
run: echo RUSTFLAGS="-C target-feature=-crt-static" >> "${GITHUB_ENV}"
7373
# We don't need to run setup-node inside of a node docker image.
7474
- op: remove
75-
path: /jobs/test-docker/steps/4
75+
path: /jobs/test-docker/steps/3
7676
# No need to check test coverage here, since we do it in the first matrix build.
7777
- op: remove
78-
path: /jobs/test-docker/steps/8
78+
path: /jobs/test-docker/steps/7

.github/workflows/typescript-ci.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
fail-fast: false
3030
steps:
3131
- uses: actions/checkout@v2
32-
- uses: c-hive/gha-yarn-cache@v1
33-
- uses: actions/[email protected]
32+
- uses: actions/setup-node@v2
3433
with:
3534
node-version: ${{ matrix.node_version }}
35+
cache: yarn
3636
- uses: actions-rs/toolchain@v1
3737
with:
3838
profile: minimal
@@ -70,7 +70,6 @@ jobs:
7070
- run: apk add build-base git python3 wget
7171
- run: echo RUSTFLAGS="-C target-feature=-crt-static" >> "${GITHUB_ENV}"
7272
- uses: actions/checkout@v2
73-
- uses: c-hive/gha-yarn-cache@v1
7473
- uses: actions-rs/toolchain@v1
7574
with:
7675
profile: minimal

0 commit comments

Comments
 (0)