Skip to content

Commit 25d8dcc

Browse files
committed
Merge BlockstreamResearch#210: Locked CI
207fd32 CI: Use recent lock (Christian Lewe) ecb79aa Cargo: Add recent lock (Christian Lewe) d14b514 CI: Execute MSRV last (Christian Lewe) 8b2fd3f CI: Compress file (Christian Lewe) Pull request description: Add a lock file that works with all supported rust versions. Use this lock file in CI. ACKs for top commit: apoelstra: ACK 207fd32 Tree-SHA512: 0d53db97ecda03f7a8731e652ef45cc07cd064974845d39525f4b733afeb855adbf97aaef5fc81d3b4c8b4092011d83e29c431e75fce86f1dfd7daddb283bb13
2 parents c7f1371 + 207fd32 commit 25d8dcc

File tree

2 files changed

+409
-53
lines changed

2 files changed

+409
-53
lines changed

.github/workflows/main.yml

+14-53
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,24 @@ jobs:
66
fmt:
77
name: Rustfmt
88
runs-on: ubuntu-latest
9-
strategy:
10-
matrix:
11-
rust:
12-
- stable
139
steps:
1410
- name: Checkout Crate
1511
uses: actions/checkout@v4
1612
- name: Checkout Toolchain
17-
uses: dtolnay/rust-toolchain@master
13+
uses: dtolnay/rust-toolchain@stable
1814
with:
19-
toolchain: ${{ matrix.rust }}
2015
components: rustfmt
2116
- name: Running cargo fmt
2217
run: cargo fmt --all -- --check
2318

2419
simpcli_test:
2520
name: SimpCLI Tests
2621
runs-on: ubuntu-latest
27-
strategy:
28-
matrix:
29-
rust:
30-
- stable
3122
steps:
3223
- name: Checkout Crate
3324
uses: actions/checkout@v4
3425
- name: Checkout Toolchain
35-
uses: dtolnay/rust-toolchain@master
36-
with:
37-
toolchain: ${{ matrix.rust }}
26+
uses: dtolnay/rust-toolchain@stable
3827
- name: Running cargo test
3928
run: |
4029
cd simpcli
@@ -43,17 +32,11 @@ jobs:
4332
bench_test:
4433
name: Jets-Bench Tests
4534
runs-on: ubuntu-latest
46-
strategy:
47-
matrix:
48-
rust:
49-
- stable
5035
steps:
5136
- name: Checkout Crate
5237
uses: actions/checkout@v4
5338
- name: Checkout Toolchain
54-
uses: dtolnay/rust-toolchain@master
55-
with:
56-
toolchain: ${{ matrix.rust }}
39+
uses: dtolnay/rust-toolchain@stable
5740
- name: Running cargo test
5841
run: |
5942
cargo install cargo-criterion
@@ -68,74 +51,52 @@ jobs:
6851
matrix:
6952
rust:
7053
- stable
71-
- 1.58.0
7254
- beta
7355
- nightly
56+
- 1.58.0
7457
steps:
7558
- name: Checkout Crate
7659
uses: actions/checkout@v4
7760
- name: Checkout Toolchain
7861
uses: dtolnay/rust-toolchain@master
7962
with:
8063
toolchain: ${{ matrix.rust }}
64+
- name: Set dependencies
65+
run: cp Cargo-recent.lock Cargo.lock
8166
- name: Running cargo test
8267
env:
8368
FEATURES: bitcoin elements test-utils
8469
run: |
85-
if cargo --version | grep "1\.58"; then
86-
# 1.0.100 uses syn 2.0 which requires edition 2021
87-
cargo update -p serde_json --precise 1.0.99
88-
# 1.0.157 uses syn 2.0
89-
cargo update -p serde --precise 1.0.156
90-
# 1.0.31 uses proc-macro 1.0.66
91-
cargo update -p quote --precise 1.0.30
92-
# 1.0.66 uses edition 2021
93-
cargo update -p proc-macro2 --precise 1.0.65
94-
# 1.8.0 requires cargo 1.60+
95-
cargo update -p regex --precise 1.7.0
96-
# 1.5.0 uses edition 2021
97-
cargo update -p byteorder --precise 1.4.3
98-
fi
99-
for f in $FEATURES; do echo "Features: $f" && cargo test --no-default-features --features="$f"; done
70+
for f in $FEATURES; do echo "Features: $f" && cargo test --locked --no-default-features --features="$f"; done
10071
cd simplicity-sys
101-
cargo test --no-default-features
102-
cargo test --features="test-utils"
103-
echo "No default features" && cargo test --no-default-features
104-
echo "All features" && cargo test --all-features
72+
cargo test --locked --no-default-features
73+
cargo test --locked --features="test-utils"
74+
echo "No default features" && cargo test --locked --no-default-features
75+
echo "All features" && cargo test --locked --all-features
10576
10677
ignored:
10778
name: Ignored Tests
10879
runs-on: ubuntu-latest
109-
strategy:
110-
matrix:
111-
rust:
112-
- stable
11380
steps:
11481
- name: Checkout Crate
11582
uses: actions/checkout@v4
11683
- name: Checkout Toolchain
117-
uses: dtolnay/rust-toolchain@master
118-
with:
119-
toolchain: ${{ matrix.rust }}
84+
uses: dtolnay/rust-toolchain@stable
12085
- name: Running cargo test
121-
run: |
122-
cargo test -- --ignored
86+
run: cargo test -- --ignored
12387

12488
clippy:
12589
name: Clippy
12690
runs-on: ${{ matrix.os }}
12791
strategy:
12892
matrix:
12993
os: [ubuntu-latest, macos-latest, windows-latest]
130-
rust:
131-
- stable
13294
steps:
13395
- name: Checkout Crate
13496
uses: actions/checkout@v4
13597
- name: Checkout Toolchain
136-
uses: dtolnay/rust-toolchain@master
98+
uses: dtolnay/rust-toolchain@stable
13799
with:
138-
toolchain: ${{ matrix.rust }}
139100
components: clippy
140101
- name: Running cargo clippy
141102
run: cargo clippy --all-targets -- --deny warnings

0 commit comments

Comments
 (0)