Skip to content

Commit 8582f3e

Browse files
committed
put verus under anvil because .. is not supported for cache
1 parent 96a1d7f commit 8582f3e

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

.github/workflows/ci.yml

+20-21
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/cache@v4
2424
with:
2525
path: |
26-
../verus/source
26+
verus/source
2727
key: verus-${{ runner.os }}-${{ env.verus_commit }}
2828
- name: Download Verus if cache is missing
2929
if: steps.cache-verus.outputs.cache-hit != 'true'
@@ -35,8 +35,7 @@ jobs:
3535
- name: Build Verus if cache is missing
3636
if: steps.cache-verus.outputs.cache-hit != 'true'
3737
run: |
38-
mv verus ../verus
39-
cd ../verus
38+
cd verus
4039
curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
4140
. "$HOME/.cargo/env"
4241
rustup toolchain install
@@ -59,10 +58,10 @@ jobs:
5958
uses: actions/cache@v4
6059
with:
6160
path: |
62-
../verus/source
61+
verus/source
6362
key: verus-${{ runner.os }}-${{ env.verus_commit }}
6463
- name: Verify fluent controller
65-
run: VERUS_DIR="$(dirname "${PWD}")/verus" ./build.sh fluent_controller.rs --time --rlimit 50
64+
run: VERUS_DIR="${PWD}/verus" ./build.sh fluent_controller.rs --time --rlimit 50
6665
rabbitmq-verification:
6766
needs: build-verus
6867
runs-on: ubuntu-22.04
@@ -77,10 +76,10 @@ jobs:
7776
uses: actions/cache@v4
7877
with:
7978
path: |
80-
../verus/source
79+
verus/source
8180
key: verus-${{ runner.os }}-${{ env.verus_commit }}
8281
- name: Verify rabbitmq controller
83-
run: VERUS_DIR="$(dirname "${PWD}")/verus" ./build.sh rabbitmq_controller.rs --time --rlimit 50
82+
run: VERUS_DIR="${PWD}/verus" ./build.sh rabbitmq_controller.rs --time --rlimit 50
8483
zookeeper-verification:
8584
needs: build-verus
8685
runs-on: ubuntu-22.04
@@ -95,10 +94,10 @@ jobs:
9594
uses: actions/cache@v4
9695
with:
9796
path: |
98-
../verus/source
97+
verus/source
9998
key: verus-${{ runner.os }}-${{ env.verus_commit }}
10099
- name: Verify zookeeper controller
101-
run: VERUS_DIR="$(dirname "${PWD}")/verus" ./build.sh zookeeper_controller.rs --time --rlimit 100
100+
run: VERUS_DIR="${PWD}/verus" ./build.sh zookeeper_controller.rs --time --rlimit 100
102101
vreplicaset-verification:
103102
needs: build-verus
104103
runs-on: ubuntu-22.04
@@ -113,10 +112,10 @@ jobs:
113112
uses: actions/cache@v4
114113
with:
115114
path: |
116-
../verus/source
115+
verus/source
117116
key: verus-${{ runner.os }}-${{ env.verus_commit }}
118117
- name: Verify vreplicaset controller
119-
run: VERUS_DIR="$(dirname "${PWD}")/verus" ./build.sh vreplicaset_controller.rs --time
118+
run: VERUS_DIR="${PWD}/verus" ./build.sh vreplicaset_controller.rs --time
120119
v2-vreplicaset-verification:
121120
needs: build-verus
122121
runs-on: ubuntu-22.04
@@ -131,10 +130,10 @@ jobs:
131130
uses: actions/cache@v4
132131
with:
133132
path: |
134-
../verus/source
133+
verus/source
135134
key: verus-${{ runner.os }}-${{ env.verus_commit }}
136135
- name: Verify vreplicaset controller
137-
run: VERUS_DIR="$(dirname "${PWD}")/verus" ./build.sh v2_vreplicaset_controller.rs --rlimit 50 --time
136+
run: VERUS_DIR="${PWD}/verus" ./build.sh v2_vreplicaset_controller.rs --rlimit 50 --time
138137
v2-vdeployment-verification:
139138
needs: build-verus
140139
runs-on: ubuntu-22.04
@@ -149,10 +148,10 @@ jobs:
149148
uses: actions/cache@v4
150149
with:
151150
path: |
152-
../verus/source
151+
verus/source
153152
key: verus-${{ runner.os }}-${{ env.verus_commit }}
154153
- name: Verify vdeployment controller
155-
run: VERUS_DIR="$(dirname "${PWD}")/verus" ./build.sh v2_vdeployment_controller.rs --rlimit 50 --time
154+
run: VERUS_DIR="${PWD}/verus" ./build.sh v2_vdeployment_controller.rs --rlimit 50 --time
156155
unit-tests:
157156
needs: build-verus
158157
runs-on: ubuntu-22.04
@@ -167,7 +166,7 @@ jobs:
167166
uses: actions/cache@v4
168167
with:
169168
path: |
170-
../verus/source
169+
verus/source
171170
key: verus-${{ runner.os }}-${{ env.verus_commit }}
172171
- name: Pin home to version 0.5.9 (workaround)
173172
run: cargo update home --precise 0.5.9
@@ -186,7 +185,7 @@ jobs:
186185
uses: actions/cache@v4
187186
with:
188187
path: |
189-
../verus/source
188+
verus/source
190189
key: verus-${{ runner.os }}-${{ env.verus_commit }}
191190
- name: Setup Go
192191
uses: actions/setup-go@v5
@@ -214,10 +213,10 @@ jobs:
214213
uses: actions/cache@v4
215214
with:
216215
path: |
217-
../verus/source
216+
verus/source
218217
key: verus-${{ runner.os }}-${{ env.verus_commit }}
219218
- name: Verify conformance of the executable model
220-
run: VERUS_DIR="$(dirname "${PWD}")/verus" ./build.sh anvil.rs --crate-type lib --time
219+
run: VERUS_DIR="${PWD}/verus" ./build.sh anvil.rs --crate-type lib --time
221220
framework-v2-verification:
222221
needs: build-verus
223222
runs-on: ubuntu-22.04
@@ -232,10 +231,10 @@ jobs:
232231
uses: actions/cache@v4
233232
with:
234233
path: |
235-
../verus/source
234+
verus/source
236235
key: verus-${{ runner.os }}-${{ env.verus_commit }}
237236
- name: Verify conformance of the executable model
238-
run: VERUS_DIR="$(dirname "${PWD}")/verus" ./build.sh anvil_v2.rs --crate-type lib --rlimit 50 --time
237+
run: VERUS_DIR="${PWD}/verus" ./build.sh anvil_v2.rs --crate-type lib --rlimit 50 --time
239238
fluent-e2e-test:
240239
runs-on: ubuntu-22.04
241240
steps:

0 commit comments

Comments
 (0)