update veritas to rust 1.79.0

verus-lang · Jan 17, 2025 · 9d8ec20 · 9d8ec20
1 parent c7c33d0
commit 9d8ec20
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/tools/veritas/build_images.sh b/tools/veritas/build_images.sh
@@ -8,5 +8,5 @@ if [ "$(dirname "$0")" != "." ]; then
 fi
 
 docker build -f verus-lang_verus-base.dockerfile -t ghcr.io/utaal/verus-lang/verus-base .
-docker build -f verus-lang_verus-base-1.76.0.dockerfile -t ghcr.io/utaal/verus-lang/verus-base:rust-1.76.0 .
-docker build -f verus-lang_veritas-1.76.0.dockerfile -t ghcr.io/utaal/verus-lang/veritas:rust-1.76.0 .
+docker build -f verus-lang_verus-base-1.79.0.dockerfile -t ghcr.io/utaal/verus-lang/verus-base:rust-1.79.0 .
+docker build -f verus-lang_veritas-1.79.0.dockerfile -t ghcr.io/utaal/verus-lang/veritas:rust-1.79.0 .
diff --git a/tools/veritas/run.sh b/tools/veritas/run.sh
@@ -13,4 +13,5 @@ docker run --platform=linux/amd64 \
     -v verus-veritas-z3-cache:/root/z3-cache \
     -v verus-veritas-rustup:/root/.rustup \
     -v $(pwd)/output:/root/output \
-    --rm ghcr.io/utaal/verus-lang/veritas:rust-1.76.0 $@
+    ghcr.io/utaal/verus-lang/veritas:rust-1.79.0 $@
+    # --rm ghcr.io/utaal/verus-lang/veritas:rust-1.79.0 $@
diff --git a/tools/veritas/run_configuration_all.toml b/tools/veritas/run_configuration_all.toml
@@ -14,7 +14,7 @@ extra_args = [
 prepare_script = """
 pushd test_libc
 cargo clean
-cargo +1.76.0 build --release
+cargo +1.79.0 build --release
 popd
 LIBC_RLIB_NAME=$(find ./test_libc/target/release/deps/ -name 'liblibc-*.rlib')
 mkdir -p build

diff --git a/...itas/verus-lang_veritas-1.76.0.dockerfile → ...itas/verus-lang_veritas-1.79.0.dockerfile b/...itas/verus-lang_veritas-1.76.0.dockerfile → ...itas/verus-lang_veritas-1.79.0.dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 ghcr.io/utaal/verus-lang/verus-base:rust-1.76.0
+FROM --platform=linux/amd64 ghcr.io/utaal/verus-lang/verus-base:rust-1.79.0
 
 VOLUME /root/veritas
 
@@ -14,4 +14,4 @@ ENV WORKDIR_PATH=/root/work/
 ENV OUTPUT_PATH=/root/output/
 
 WORKDIR /root/veritas
-ENTRYPOINT ["/bin/bash", "container-entrypoint.sh"]
+ENTRYPOINT ["/bin/bash", "container-entrypoint.sh"]
diff --git a/...s/verus-lang_verus-base-1.76.0.dockerfile → ...s/verus-lang_verus-base-1.79.0.dockerfile b/...s/verus-lang_verus-base-1.76.0.dockerfile → ...s/verus-lang_verus-base-1.79.0.dockerfile
@@ -1,3 +1,3 @@
 FROM --platform=linux/amd64 ghcr.io/utaal/verus-lang/verus-base
 
-RUN /root/.cargo/bin/rustup install 1.76.0
+RUN /root/.cargo/bin/rustup install 1.79.0
diff --git a/tools/veritas/verus-lang_verus-base.dockerfile b/tools/veritas/verus-lang_verus-base.dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 ubuntu:mantic
+FROM --platform=linux/amd64 ubuntu:24.04
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
     build-essential curl wget singular git unzip openssh-client pkg-config libssl-dev