Skip to content

Commit 00ce305

Browse files
authored
Merge branch 'master' into yuanzhao08
2 parents 18c7763 + a0ec880 commit 00ce305

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+3397
-1091
lines changed

.github/workflows/benchmark.yml

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,17 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
- name: Setup Golang
22-
uses: actions/setup-go@v4
22+
uses: actions/setup-go@v5
2323
with:
2424
go-version-file: 'go.work'
2525
cache-dependency-path: "**/*.sum"
2626
- name: Build Contrib
2727
run: |
28-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.54.2
2928
make -e DOCKER=false nydusify-release
3029
- name: Upload Nydusify
31-
uses: actions/upload-artifact@master
30+
uses: actions/upload-artifact@v4
3231
with:
3332
name: nydusify-artifact
3433
path: contrib/nydusify/cmd/nydusify
@@ -37,18 +36,18 @@ jobs:
3736
runs-on: ubuntu-latest
3837
steps:
3938
- name: Checkout
40-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
4140
- name: Rust Cache
42-
uses: Swatinem/rust-cache@v2.7.0
41+
uses: Swatinem/rust-cache@v2
4342
with:
4443
cache-on-failure: true
4544
shared-key: Linux-cargo-amd64
45+
- uses: dsherret/rust-toolchain-file@v1
4646
- name: Build Nydus
4747
run: |
48-
rustup component add rustfmt clippy
49-
make
48+
make release
5049
- name: Upload Nydus Binaries
51-
uses: actions/upload-artifact@master
50+
uses: actions/upload-artifact@v4
5251
with:
5352
name: nydus-artifact
5453
path: |
@@ -85,14 +84,14 @@ jobs:
8584
tag: 8-al2022-jdk
8685
steps:
8786
- name: Checkout
88-
uses: actions/checkout@v3
87+
uses: actions/checkout@v4
8988
- name: Download Nydus
90-
uses: actions/download-artifact@master
89+
uses: actions/download-artifact@v4
9190
with:
9291
name: nydus-artifact
9392
path: target/release
9493
- name: Download Nydusify
95-
uses: actions/download-artifact@master
94+
uses: actions/download-artifact@v4
9695
with:
9796
name: nydusify-artifact
9897
path: contrib/nydusify/cmd
@@ -107,7 +106,7 @@ jobs:
107106
export SNAPSHOTTER=overlayfs
108107
sudo -E make smoke-benchmark
109108
- name: Save BenchMark Result
110-
uses: actions/upload-artifact@v3
109+
uses: actions/upload-artifact@v4
111110
with:
112111
name: benchmark-oci-${{ matrix.image }}
113112
path: smoke/${{ matrix.image }}-oci.json
@@ -132,14 +131,14 @@ jobs:
132131
tag: 8-al2022-jdk
133132
steps:
134133
- name: Checkout
135-
uses: actions/checkout@v3
134+
uses: actions/checkout@v4
136135
- name: Download Nydus
137-
uses: actions/download-artifact@master
136+
uses: actions/download-artifact@v4
138137
with:
139138
name: nydus-artifact
140139
path: target/release
141140
- name: Download Nydusify
142-
uses: actions/download-artifact@master
141+
uses: actions/download-artifact@v4
143142
with:
144143
name: nydusify-artifact
145144
path: contrib/nydusify/cmd
@@ -153,7 +152,7 @@ jobs:
153152
export BENCHMARK_METRIC_FILE=${{ matrix.image }}-fsversion-v5.json
154153
sudo -E make smoke-benchmark
155154
- name: Save BenchMark Result
156-
uses: actions/upload-artifact@v3
155+
uses: actions/upload-artifact@v4
157156
with:
158157
name: benchmark-fsversion-v5-${{ matrix.image }}
159158
path: smoke/${{ matrix.image }}-fsversion-v5.json
@@ -178,14 +177,14 @@ jobs:
178177
tag: 8-al2022-jdk
179178
steps:
180179
- name: Checkout
181-
uses: actions/checkout@v3
180+
uses: actions/checkout@v4
182181
- name: Download Nydus
183-
uses: actions/download-artifact@master
182+
uses: actions/download-artifact@v4
184183
with:
185184
name: nydus-artifact
186185
path: target/release
187186
- name: Download Nydusify
188-
uses: actions/download-artifact@master
187+
uses: actions/download-artifact@v4
189188
with:
190189
name: nydusify-artifact
191190
path: contrib/nydusify/cmd
@@ -199,7 +198,7 @@ jobs:
199198
export BENCHMARK_METRIC_FILE=${{ matrix.image }}-fsversion-v6.json
200199
sudo -E make smoke-benchmark
201200
- name: Save BenchMark Result
202-
uses: actions/upload-artifact@v3
201+
uses: actions/upload-artifact@v4
203202
with:
204203
name: benchmark-fsversion-v6-${{ matrix.image }}
205204
path: smoke/${{ matrix.image }}-fsversion-v6.json
@@ -224,14 +223,14 @@ jobs:
224223
tag: 8-al2022-jdk
225224
steps:
226225
- name: Checkout
227-
uses: actions/checkout@v3
226+
uses: actions/checkout@v4
228227
- name: Download Nydus
229-
uses: actions/download-artifact@master
228+
uses: actions/download-artifact@v4
230229
with:
231230
name: nydus-artifact
232231
path: target/release
233232
- name: Download Nydusify
234-
uses: actions/download-artifact@master
233+
uses: actions/download-artifact@v4
235234
with:
236235
name: nydusify-artifact
237236
path: contrib/nydusify/cmd
@@ -245,7 +244,7 @@ jobs:
245244
export BENCHMARK_METRIC_FILE=${{ matrix.image }}-zran.json
246245
sudo -E make smoke-benchmark
247246
- name: Save BenchMark Result
248-
uses: actions/upload-artifact@v3
247+
uses: actions/upload-artifact@v4
249248
with:
250249
name: benchmark-zran-${{ matrix.image }}
251250
path: smoke/${{ matrix.image }}-zran.json
@@ -270,30 +269,27 @@ jobs:
270269
tag: 8-al2022-jdk
271270
steps:
272271
- name: Checkout
273-
uses: actions/checkout@v3
272+
uses: actions/checkout@v4
274273
- name: Download benchmark-oci
275-
uses: actions/download-artifact@v3
274+
uses: actions/download-artifact@v4
276275
with:
277276
name: benchmark-oci-${{ matrix.image }}
278277
path: benchmark-result
279278
- name: Download benchmark-fsversion-v5
280-
uses: actions/download-artifact@v3
279+
uses: actions/download-artifact@v4
281280
with:
282281
name: benchmark-fsversion-v5-${{ matrix.image }}
283282
path: benchmark-result
284283
- name: Download benchmark-fsversion-v6
285-
uses: actions/download-artifact@v3
284+
uses: actions/download-artifact@v4
286285
with:
287286
name: benchmark-fsversion-v6-${{ matrix.image }}
288287
path: benchmark-result
289288
- name: Download benchmark-zran
290-
uses: actions/download-artifact@v3
289+
uses: actions/download-artifact@v4
291290
with:
292291
name: benchmark-zran-${{ matrix.image }}
293292
path: benchmark-result
294-
- uses: geekyeggo/delete-artifact@v2
295-
with:
296-
name: "*-${{matrix.image}}"
297293
- name: Benchmark Summary
298294
run: |
299295
case ${{matrix.image}} in

0 commit comments

Comments
 (0)