diff --git a/tools/veritas/build_images.sh b/tools/veritas/build_images.sh index 6049de041e..5d60dafd06 100644 --- a/tools/veritas/build_images.sh +++ b/tools/veritas/build_images.sh @@ -7,6 +7,6 @@ if [ "$(dirname "$0")" != "." ]; then exit 1 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.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 . +docker build -f verus-lang_verus-deps.dockerfile -t ghcr.io/utaal/verus-lang/verus-deps . +docker build -f verus-lang_verus-base-1.82.0.dockerfile -t ghcr.io/utaal/verus-lang/verus-base:rust-1.82.0 . +docker build -f verus-lang_veritas-1.82.0.dockerfile -t ghcr.io/utaal/verus-lang/veritas:rust-1.82.0 . diff --git a/tools/veritas/build_verus.sh b/tools/veritas/build_verus.sh index a910292826..9be60fd2f0 100644 --- a/tools/veritas/build_verus.sh +++ b/tools/veritas/build_verus.sh @@ -4,9 +4,10 @@ set -x unset RUSTUP_TOOLCHAIN cd source -pushd tools/line_count -cargo build --release -popd +# TODO restore once line_count is fixed +# pushd tools/line_count +# cargo build --release +# popd . ../tools/activate # ./tools/get-z3.sh diff --git a/tools/veritas/push_images.sh b/tools/veritas/push_images.sh new file mode 100644 index 0000000000..3fbcd4ba1d --- /dev/null +++ b/tools/veritas/push_images.sh @@ -0,0 +1,12 @@ + +set -e +set -x + +if [ "$(dirname "$0")" != "." ]; then + echo "Please run the script from its directory." + exit 1 +fi + +docker push ghcr.io/utaal/verus-lang/verus-deps +docker push ghcr.io/utaal/verus-lang/verus-base:rust-1.82.0 +docker push ghcr.io/utaal/verus-lang/veritas:rust-1.82.0 diff --git a/tools/veritas/run.sh b/tools/veritas/run.sh index 62fd405654..a9a6644eec 100644 --- a/tools/veritas/run.sh +++ b/tools/veritas/run.sh @@ -13,5 +13,4 @@ docker run --platform=linux/amd64 \ -v verus-veritas-z3-cache:/root/z3-cache \ -v verus-veritas-rustup:/root/.rustup \ -v $(pwd)/output:/root/output \ - ghcr.io/utaal/verus-lang/veritas:rust-1.79.0 $@ - # --rm ghcr.io/utaal/verus-lang/veritas:rust-1.79.0 $@ + ghcr.io/utaal/verus-lang/veritas:rust-1.82.0 $@ diff --git a/tools/veritas/run_configuration_all.toml b/tools/veritas/run_configuration_all.toml index e3a87b478a..3d84f63589 100644 --- a/tools/veritas/run_configuration_all.toml +++ b/tools/veritas/run_configuration_all.toml @@ -1,6 +1,7 @@ verus_git_url = "https://github.com/verus-lang/verus.git" verus_revspec = "main" verus_features = ["singular"] +verus_verify_vstd = false [[project]] name = "memory-allocator" @@ -14,7 +15,7 @@ extra_args = [ prepare_script = """ pushd test_libc cargo clean -cargo +1.79.0 build --release +cargo +1.82.0 build --release popd LIBC_RLIB_NAME=$(find ./test_libc/target/release/deps/ -name 'liblibc-*.rlib') mkdir -p build @@ -24,9 +25,9 @@ cp $LIBC_RLIB_NAME build/liblibc.rlib [[project]] name = "page-table" git_url = "https://github.com/utaal/verified-nrkernel.git" -revspec = "page-table" -crate_root = "page-table/main.rs" -extra_args = ["--rlimit", "60"] +revspec = "main" +crate_root = "page-table/src/lib.rs" +extra_args = ["--crate-type=lib", "--rlimit", "60"] [[project]] name = "verified-storage" @@ -52,7 +53,7 @@ cargo build [[project]] name = "node-replication" -git_url = "https://github.com/achreto/verified-node-replication.git" +git_url = "https://github.com/verus-lang/verified-node-replication.git" revspec = "main" crate_root = "verified-node-replication/src/lib.rs" extra_args = ["--crate-type=dylib"] diff --git a/tools/veritas/run_configuration_small.toml b/tools/veritas/run_configuration_page_table.toml similarity index 60% rename from tools/veritas/run_configuration_small.toml rename to tools/veritas/run_configuration_page_table.toml index 9bff892050..e91538826e 100644 --- a/tools/veritas/run_configuration_small.toml +++ b/tools/veritas/run_configuration_page_table.toml @@ -1,11 +1,12 @@ verus_git_url = "https://github.com/verus-lang/verus.git" verus_revspec = "main" verus_features = ["singular"] +verus_verify_vstd = false [[project]] name = "page-table" git_url = "https://github.com/utaal/verified-nrkernel.git" -revspec = "page-table" -crate_root = "page-table/main.rs" -extra_args = ["--rlimit", "60"] +revspec = "main" +crate_root = "page-table/src/lib.rs" +extra_args = ["--crate-type=lib", "--rlimit", "60"] diff --git a/tools/veritas/run_configuration_vstd.toml b/tools/veritas/run_configuration_vstd.toml new file mode 100644 index 0000000000..f87f130712 --- /dev/null +++ b/tools/veritas/run_configuration_vstd.toml @@ -0,0 +1,4 @@ +verus_git_url = "https://github.com/verus-lang/verus.git" +verus_revspec = "main" +verus_features = ["singular"] + diff --git a/tools/veritas/src/main.rs b/tools/veritas/src/main.rs index c89925fa16..4c1bca254d 100644 --- a/tools/veritas/src/main.rs +++ b/tools/veritas/src/main.rs @@ -391,10 +391,10 @@ fn run(run_configuration_path: &str) -> Result<(), VeritasError> { revspec: run_configuration.verus_revspec.clone(), crate_root: "source/vstd/vstd.rs".to_owned(), extra_args: Some(vec![ - "--no-vstd".to_owned(), + "--is-vstd".to_owned(), "--crate-type=lib".to_owned(), - "-V".to_owned(), - "use-crate-name".to_owned(), + // "-V".to_owned(), + // "use-crate-name".to_owned(), ]), prepare_script: None, }, @@ -466,8 +466,8 @@ fn run(run_configuration_path: &str) -> Result<(), VeritasError> { info("verus ready"); let verus_binary_path = verus_workdir.join("source/target-verus/release/verus"); - // TODO perform line counting? - let _verus_line_count_path = verus_workdir.join("source/target/release/line_count"); + // TODO perform line counting? (once line_count is fixed) + // let _verus_line_count_path = verus_workdir.join("source/target/release/line_count"); let output_path = env_var_dir_or_err(OUTPUT_PATH_VAR)?; let date = chrono::Utc::now() diff --git a/tools/veritas/verus-lang_veritas-1.79.0.dockerfile b/tools/veritas/verus-lang_veritas-1.82.0.dockerfile similarity index 97% rename from tools/veritas/verus-lang_veritas-1.79.0.dockerfile rename to tools/veritas/verus-lang_veritas-1.82.0.dockerfile index b585bbe0b6..dc3a788b32 100644 --- a/tools/veritas/verus-lang_veritas-1.79.0.dockerfile +++ b/tools/veritas/verus-lang_veritas-1.82.0.dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ghcr.io/utaal/verus-lang/verus-base:rust-1.79.0 +FROM --platform=linux/amd64 ghcr.io/utaal/verus-lang/verus-base:rust-1.82.0 VOLUME /root/veritas diff --git a/tools/veritas/verus-lang_verus-base-1.79.0.dockerfile b/tools/veritas/verus-lang_verus-base-1.79.0.dockerfile deleted file mode 100644 index bd38d8918c..0000000000 --- a/tools/veritas/verus-lang_verus-base-1.79.0.dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM --platform=linux/amd64 ghcr.io/utaal/verus-lang/verus-base - -RUN /root/.cargo/bin/rustup install 1.79.0 diff --git a/tools/veritas/verus-lang_verus-base-1.82.0.dockerfile b/tools/veritas/verus-lang_verus-base-1.82.0.dockerfile new file mode 100644 index 0000000000..8656b11920 --- /dev/null +++ b/tools/veritas/verus-lang_verus-base-1.82.0.dockerfile @@ -0,0 +1,3 @@ +FROM --platform=linux/amd64 ghcr.io/utaal/verus-lang/verus-deps + +RUN /root/.cargo/bin/rustup install 1.82.0 diff --git a/tools/veritas/verus-lang_verus-base.dockerfile b/tools/veritas/verus-lang_verus-deps.dockerfile similarity index 100% rename from tools/veritas/verus-lang_verus-base.dockerfile rename to tools/veritas/verus-lang_verus-deps.dockerfile