Skip to content

Commit 1ed13a9

Browse files
committed
Merge #613: fuzz: Bump rustc to version1.65
ae33025 fuzz: Bump rustc version (Tobin C. Harding) d47f0f4 Make generate_files.sh conform to manifest (Tobin C. Harding) Pull request description: CI is complaining: package `regex v1.10.0` cannot be built because it requires rustc 1.65 or newer, while the currently active rustc version is 1.64.0 Bump rustc to v1.65 in the `generate_files.sh` script and run it. ACKs for top commit: apoelstra: ACK ae33025 Tree-SHA512: 3096e50b5c7021ae2e51d0093dae54e76f5324936b0cc8301d95bf2f1e4796b75cfd27b0de49c1afcf083102c5f33af9a8ee9f79fa99da85d44dca8d0bf927fc
2 parents e73a251 + ae33025 commit 1ed13a9

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

.github/workflows/fuzz.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
fuzz_target: [
19-
roundtrip_miniscript_str,
20-
roundtrip_miniscript_script,
21-
parse_descriptor,
2219
roundtrip_semantic,
20+
parse_descriptor,
2321
parse_descriptor_secret,
22+
roundtrip_miniscript_script,
23+
roundtrip_miniscript_str,
2424
roundtrip_descriptor,
2525
roundtrip_concrete,
2626
compile_descriptor,
@@ -39,7 +39,7 @@ compile_descriptor,
3939
key: cache-${{ matrix.target }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
4040
- uses: actions-rs/toolchain@v1
4141
with:
42-
toolchain: 1.64
42+
toolchain: '1.65'
4343
override: true
4444
profile: minimal
4545
- name: fuzz

fuzz/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ miniscript = { path = "..", features = [ "compiler" ] }
1515
regex = "1.0"
1616

1717
[[bin]]
18-
name = "roundtrip_miniscript_str"
19-
path = "fuzz_targets/roundtrip_miniscript_str.rs"
20-
21-
[[bin]]
22-
name = "roundtrip_miniscript_script"
23-
path = "fuzz_targets/roundtrip_miniscript_script.rs"
18+
name = "roundtrip_semantic"
19+
path = "fuzz_targets/roundtrip_semantic.rs"
2420

2521
[[bin]]
2622
name = "parse_descriptor"
2723
path = "fuzz_targets/parse_descriptor.rs"
2824

29-
[[bin]]
30-
name = "roundtrip_semantic"
31-
path = "fuzz_targets/roundtrip_semantic.rs"
32-
3325
[[bin]]
3426
name = "parse_descriptor_secret"
3527
path = "fuzz_targets/parse_descriptor_secret.rs"
3628

29+
[[bin]]
30+
name = "roundtrip_miniscript_script"
31+
path = "fuzz_targets/roundtrip_miniscript_script.rs"
32+
33+
[[bin]]
34+
name = "roundtrip_miniscript_str"
35+
path = "fuzz_targets/roundtrip_miniscript_str.rs"
36+
3737
[[bin]]
3838
name = "roundtrip_descriptor"
3939
path = "fuzz_targets/roundtrip_descriptor.rs"

fuzz/generate-files.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ cargo-fuzz = true
2323
honggfuzz = { version = "0.5.55", default-features = false }
2424
miniscript = { path = "..", features = [ "compiler" ] }
2525
26-
regex = "1.4"
26+
regex = "1.0"
2727
EOF
2828

2929
for targetFile in $(listTargetFiles); do
@@ -72,7 +72,7 @@ $(for name in $(listTargetNames); do echo "$name,"; done)
7272
key: cache-\${{ matrix.target }}-\${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
7373
- uses: actions-rs/toolchain@v1
7474
with:
75-
toolchain: 1.58
75+
toolchain: '1.65'
7676
override: true
7777
profile: minimal
7878
- name: fuzz

0 commit comments

Comments
 (0)