Skip to content

Commit 627f2e2

Browse files
Merge pull request #517 from 10XGenomics/nd/fix_ci
Attempt to Fix CI
2 parents 7121724 + af6f9ab commit 627f2e2

File tree

2 files changed

+61
-75
lines changed

2 files changed

+61
-75
lines changed

.github/workflows/test.yaml

+4-26
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- master
88

99
env:
10+
RUST_VERSION: "1.71.0"
1011
CARGO_INCREMENTAL: 0
1112

1213
jobs:
@@ -15,22 +16,12 @@ jobs:
1516
runs-on: macos-latest
1617
steps:
1718

18-
# get prerequisite code in place (duplicated verbatim below)
19-
20-
- name: rust version
21-
# note that rust version appears in two places in this file
22-
run: rustup default 1.63.0
23-
- name: add rustfmt
24-
run: rustup component add rustfmt
25-
- name: install cargo-license
26-
run: cargo install cargo-license
27-
2819
# check out master
2920

3021
- name: Checkout enclone master
3122
uses: actions/checkout@master
3223

33-
- uses: Swatinem/rust-cache@v1
24+
- uses: Swatinem/rust-cache@v2
3425
with:
3526
key: ${{ matrix.style }}v1 # increment this to bust the cache if needed
3627

@@ -47,9 +38,7 @@ jobs:
4738
#
4839
# THIS IS A NEW VERSION. MAYBE IT WILL WORK.
4940

50-
- uses: Swatinem/rust-cache@v1
51-
with:
52-
key: ${{ matrix.style }}v1 # increment this to bust the cache if needed
41+
- uses: Swatinem/rust-cache@v2
5342

5443
# start the real work
5544

@@ -68,15 +57,6 @@ jobs:
6857
runs-on: ubuntu-latest
6958
steps:
7059

71-
# get prerequisite code in place (duplicated verbatim above)
72-
73-
- name: rust version
74-
run: rustup default 1.63.0
75-
- name: add rustfmt
76-
run: rustup component add rustfmt
77-
- name: install cargo-license
78-
run: cargo install cargo-license
79-
8060
# check out master
8161

8262
- name: Checkout enclone master
@@ -86,9 +66,7 @@ jobs:
8666

8767
# set up caching (duplicated verbatim below)
8868

89-
- uses: Swatinem/rust-cache@v1
90-
with:
91-
key: ${{ matrix.style }}v1 # increment this to bust the cache if needed
69+
- uses: Swatinem/rust-cache@v2
9270

9371
# start the real work
9472

0 commit comments

Comments
 (0)