From 29c9105e1815e6bb76b18ee721a486130ed9e48e Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Tue, 23 Jul 2024 18:14:31 +0000 Subject: [PATCH 1/2] Bump CBMC Viewer to 3.9 This is in preparation of updating to CBMC 6, which emits some properties in ways that CBMC Viewer 3.8 did not adequately parse. --- kani-dependencies | 4 ++-- src/setup.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kani-dependencies b/kani-dependencies index 200755839284..844d83c23dc7 100644 --- a/kani-dependencies +++ b/kani-dependencies @@ -4,7 +4,7 @@ CBMC_VERSION="5.95.1" # If you update this version number, remember to bump it in `src/setup.rs` too CBMC_VIEWER_MAJOR="3" -CBMC_VIEWER_MINOR="8" -CBMC_VIEWER_VERSION="3.8" +CBMC_VIEWER_MINOR="9" +CBMC_VIEWER_VERSION="3.9" KISSAT_VERSION="3.1.1" diff --git a/src/setup.rs b/src/setup.rs index 730679f06c10..58387f7031b7 100644 --- a/src/setup.rs +++ b/src/setup.rs @@ -189,7 +189,7 @@ fn setup_python_deps(kani_dir: &Path) -> Result<()> { let pyroot = kani_dir.join("pyroot"); // TODO: this is a repetition of versions from kani/kani-dependencies - let pkg_versions = &["cbmc-viewer==3.8"]; + let pkg_versions = &["cbmc-viewer==3.9"]; Command::new("python3") .args(["-m", "pip", "install", "--target"]) From 043096af68c1daf5d63b1c0bd1e163929cd5412d Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Tue, 23 Jul 2024 19:37:51 +0000 Subject: [PATCH 2/2] Update taps --- scripts/setup/macos/install_deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/setup/macos/install_deps.sh b/scripts/setup/macos/install_deps.sh index 429eb200541a..179bf8c1237f 100755 --- a/scripts/setup/macos/install_deps.sh +++ b/scripts/setup/macos/install_deps.sh @@ -4,10 +4,10 @@ set -eux -# Github promises weekly build image updates, so we can skip the update step and +# Github promises weekly build image updates, so we could skip the update step and # worst case we should only be 1-2 weeks behind upstream brew. # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-software -#brew update +brew update # Install Python separately to workround recurring homebrew CI issue. # See https://github.com/actions/runner-images/issues/9471 for more details.