Skip to content

Commit 556cf71

Browse files
authored
cargo update and fix macos CI (#3067)
Fix recurring [macos CI issue](actions/runner-images#9471) (see https://github.com/model-checking/kani/actions/runs/8234799856/job/22521976090?pr=3065#step:3:202 for an example of a failing run) and do a `cargo update`. This subsumes #3065 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.
1 parent ea710b3 commit 556cf71

File tree

2 files changed

+30
-32
lines changed

2 files changed

+30
-32
lines changed

Cargo.lock

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ version = "0.47.0"
145145
dependencies = [
146146
"anyhow",
147147
"cargo_metadata",
148-
"clap 4.5.1",
148+
"clap 4.5.2",
149149
"which",
150150
]
151151

@@ -204,19 +204,19 @@ dependencies = [
204204

205205
[[package]]
206206
name = "clap"
207-
version = "4.5.1"
207+
version = "4.5.2"
208208
source = "registry+https://github.com/rust-lang/crates.io-index"
209-
checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
209+
checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651"
210210
dependencies = [
211211
"clap_builder",
212212
"clap_derive",
213213
]
214214

215215
[[package]]
216216
name = "clap_builder"
217-
version = "4.5.1"
217+
version = "4.5.2"
218218
source = "registry+https://github.com/rust-lang/crates.io-index"
219-
checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
219+
checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
220220
dependencies = [
221221
"anstream",
222222
"anstyle",
@@ -481,7 +481,7 @@ dependencies = [
481481
name = "kani-compiler"
482482
version = "0.47.0"
483483
dependencies = [
484-
"clap 4.5.1",
484+
"clap 4.5.2",
485485
"cprover_bindings",
486486
"home",
487487
"itertools",
@@ -492,8 +492,8 @@ dependencies = [
492492
"serde",
493493
"serde_json",
494494
"shell-words",
495-
"strum 0.26.1",
496-
"strum_macros 0.26.1",
495+
"strum 0.26.2",
496+
"strum_macros 0.26.2",
497497
"tracing",
498498
"tracing-subscriber",
499499
]
@@ -504,7 +504,7 @@ version = "0.47.0"
504504
dependencies = [
505505
"anyhow",
506506
"cargo_metadata",
507-
"clap 4.5.1",
507+
"clap 4.5.2",
508508
"comfy-table",
509509
"console",
510510
"glob",
@@ -517,8 +517,8 @@ dependencies = [
517517
"rustc-demangle",
518518
"serde",
519519
"serde_json",
520-
"strum 0.26.1",
521-
"strum_macros 0.26.1",
520+
"strum 0.26.2",
521+
"strum_macros 0.26.2",
522522
"tempfile",
523523
"toml",
524524
"tracing",
@@ -550,11 +550,11 @@ dependencies = [
550550
name = "kani_metadata"
551551
version = "0.47.0"
552552
dependencies = [
553-
"clap 4.5.1",
553+
"clap 4.5.2",
554554
"cprover_bindings",
555555
"serde",
556-
"strum 0.26.1",
557-
"strum_macros 0.26.1",
556+
"strum 0.26.2",
557+
"strum_macros 0.26.2",
558558
]
559559

560560
[[package]]
@@ -896,7 +896,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
896896
dependencies = [
897897
"aho-corasick",
898898
"memchr",
899-
"regex-automata 0.4.5",
899+
"regex-automata 0.4.6",
900900
"regex-syntax 0.8.2",
901901
]
902902

@@ -911,9 +911,9 @@ dependencies = [
911911

912912
[[package]]
913913
name = "regex-automata"
914-
version = "0.4.5"
914+
version = "0.4.6"
915915
source = "registry+https://github.com/rust-lang/crates.io-index"
916-
checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
916+
checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
917917
dependencies = [
918918
"aho-corasick",
919919
"memchr",
@@ -1115,9 +1115,9 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
11151115

11161116
[[package]]
11171117
name = "strum"
1118-
version = "0.26.1"
1118+
version = "0.26.2"
11191119
source = "registry+https://github.com/rust-lang/crates.io-index"
1120-
checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f"
1120+
checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
11211121

11221122
[[package]]
11231123
name = "strum_macros"
@@ -1134,9 +1134,9 @@ dependencies = [
11341134

11351135
[[package]]
11361136
name = "strum_macros"
1137-
version = "0.26.1"
1137+
version = "0.26.2"
11381138
source = "registry+https://github.com/rust-lang/crates.io-index"
1139-
checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18"
1139+
checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
11401140
dependencies = [
11411141
"heck",
11421142
"proc-macro2",
@@ -1219,9 +1219,9 @@ dependencies = [
12191219

12201220
[[package]]
12211221
name = "toml"
1222-
version = "0.8.10"
1222+
version = "0.8.11"
12231223
source = "registry+https://github.com/rust-lang/crates.io-index"
1224-
checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
1224+
checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e"
12251225
dependencies = [
12261226
"serde",
12271227
"serde_spanned",
@@ -1240,9 +1240,9 @@ dependencies = [
12401240

12411241
[[package]]
12421242
name = "toml_edit"
1243-
version = "0.22.6"
1243+
version = "0.22.7"
12441244
source = "registry+https://github.com/rust-lang/crates.io-index"
1245-
checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
1245+
checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992"
12461246
dependencies = [
12471247
"indexmap",
12481248
"serde",

scripts/setup/macos/install_deps.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ set -eux
99
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-software
1010
#brew update
1111

12+
# Install Python separately to workround recurring homebrew CI issue.
13+
# See https://github.com/actions/runner-images/issues/9471 for more details.
14+
brew install python@3 || true
15+
brew link --overwrite python@3
16+
1217
# Install dependencies via `brew`
1318
brew install universal-ctags wget jq
1419

15-
# Add Python package dependencies
16-
PYTHON_DEPS=(
17-
autopep8
18-
)
19-
20-
python3 -m pip install "${PYTHON_DEPS[@]}"
21-
2220
# Get the directory containing this script
2321
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
2422

0 commit comments

Comments
 (0)