Skip to content

Commit 258faf7

Browse files
authored
Upgrade Verus version (#484)
Signed-off-by: Xudong Sun <xudongs3@illinois.edu>
1 parent 9ad9cb1 commit 258faf7

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
repository: verus-lang/verus
2323
path: verus
24-
ref: 1a9e3c577847b4a230ff7fe15b5b080a71cdf3c8
24+
ref: 8e24346e9a93e25bca6b66505f4007645118df43
2525
- name: Move Verus
2626
run: mv verus ../verus
2727
- name: Install Rust toolchain
@@ -44,7 +44,7 @@ jobs:
4444
with:
4545
repository: verus-lang/verus
4646
path: verus
47-
ref: 1a9e3c577847b4a230ff7fe15b5b080a71cdf3c8
47+
ref: 8e24346e9a93e25bca6b66505f4007645118df43
4848
- name: Move Verus
4949
run: mv verus ../verus
5050
- name: Install Rust toolchain
@@ -67,7 +67,7 @@ jobs:
6767
with:
6868
repository: verus-lang/verus
6969
path: verus
70-
ref: 1a9e3c577847b4a230ff7fe15b5b080a71cdf3c8
70+
ref: 8e24346e9a93e25bca6b66505f4007645118df43
7171
- name: Move Verus
7272
run: mv verus ../verus
7373
- name: Install Rust toolchain
@@ -90,7 +90,7 @@ jobs:
9090
with:
9191
repository: verus-lang/verus
9292
path: verus
93-
ref: 1a9e3c577847b4a230ff7fe15b5b080a71cdf3c8
93+
ref: 8e24346e9a93e25bca6b66505f4007645118df43
9494
- name: Move Verus
9595
run: mv verus ../verus
9696
- name: Install Rust toolchain
@@ -113,7 +113,7 @@ jobs:
113113
with:
114114
repository: verus-lang/verus
115115
path: verus
116-
ref: 1a9e3c577847b4a230ff7fe15b5b080a71cdf3c8
116+
ref: 8e24346e9a93e25bca6b66505f4007645118df43
117117
- name: Move Verus
118118
run: mv verus ../verus
119119
- name: Install Rust toolchain
@@ -147,7 +147,7 @@ jobs:
147147
with:
148148
repository: verus-lang/verus
149149
path: verus
150-
ref: 1a9e3c577847b4a230ff7fe15b5b080a71cdf3c8
150+
ref: 8e24346e9a93e25bca6b66505f4007645118df43
151151
- name: Move Verus
152152
run: mv verus ../verus
153153
- name: Install Rust toolchain

‎.github/workflows/verus-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
- name: Build Verus image
1818
run: |
1919
cd docker/verus
20-
docker build -t ghcr.io/${{ env.IMAGE_NAME }}/verus:latest --build-arg VERUS_VER=1a9e3c577847b4a230ff7fe15b5b080a71cdf3c8 .
21-
docker tag ghcr.io/${{ env.IMAGE_NAME }}/verus:latest ghcr.io/${{ env.IMAGE_NAME }}/verus:1a9e3c577847b4a230ff7fe15b5b080a71cdf3c8
20+
docker build -t ghcr.io/${{ env.IMAGE_NAME }}/verus:latest --build-arg VERUS_VER=8e24346e9a93e25bca6b66505f4007645118df43 .
21+
docker tag ghcr.io/${{ env.IMAGE_NAME }}/verus:latest ghcr.io/${{ env.IMAGE_NAME }}/verus:8e24346e9a93e25bca6b66505f4007645118df43
2222
- name: Push Verus image
2323
run: |
2424
docker push ghcr.io/${{ env.IMAGE_NAME }}/verus:latest
25-
docker push ghcr.io/${{ env.IMAGE_NAME }}/verus:1a9e3c577847b4a230ff7fe15b5b080a71cdf3c8
25+
docker push ghcr.io/${{ env.IMAGE_NAME }}/verus:8e24346e9a93e25bca6b66505f4007645118df43

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Anvil is a framework for building and formally verifying Kubernetes controllers.
77

88
So far, we have built and verified three Kubernetes controllers (for managing ZooKeeper, RabbitMQ and FluentBit) using Anvil. We used the [Pravega ZooKeeper operator](https://github.com/pravega/zookeeper-operator), [official RabbitMQ operator](https://github.com/rabbitmq/cluster-operator) and [official Fluent operator](https://github.com/fluent/fluent-operator) as references when building our controllers. We are now using Anvil to build (and verify) more controllers, including Kubernetes built-in controllers.
99

10-
For now, the best way to use Anvil is to download the source code and import its components into your controller projects, like what we did for our controller [examples](src/controller_examples/). To use Anvil, you will need to install [Verus](https://github.com/verus-lang/verus) (See the [installation instructions](https://github.com/verus-lang/verus/blob/main/INSTALL.md)). Currently Anvil uses Verus version `1a9e3c577847b4a230ff7fe15b5b080a71cdf3c8`.
10+
For now, the best way to use Anvil is to download the source code and import its components into your controller projects, like what we did for our controller [examples](src/controller_examples/). To use Anvil, you will need to install [Verus](https://github.com/verus-lang/verus) (See the [installation instructions](https://github.com/verus-lang/verus/blob/main/INSTALL.md)). Currently Anvil uses Verus version `8e24346e9a93e25bca6b66505f4007645118df43`.
1111

1212
If you want to reproduce the results in the OSDI'24 paper "Anvil: Verifying Liveness of Cluster Management Controllers", please refer to the [osdi24](https://github.com/vmware-research/verifiable-controllers/tree/osdi24) branch.
1313

‎rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# this should be synchronized with the Verus version, since we need to combine
22
# k8s compiled with rustc and our own code compiled with rust-verify.sh
33
[toolchain]
4-
channel = "1.73.0"
4+
channel = "1.76.0"

‎src/vstd_ext/string_map.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl StringMap {
5858
v.is_Some() ==> v.get_Some_0()@ == self@[key@],
5959
{
6060
match self.inner.get(key.as_rust_string_ref()) {
61-
Some(v) => Some(StrSlice::from_rust_str(v)),
61+
Some(v) => Some(v),
6262
None => None,
6363
}
6464
}

0 commit comments

Comments
 (0)