Skip to content

Commit 275ed61

Browse files
authored
Merge pull request #251 from Wenzel/update_deps
cargo: update deps
2 parents fc21e90 + 7c366f3 commit 275ed61

File tree

6 files changed

+323
-553
lines changed

6 files changed

+323
-553
lines changed

.github/workflows/ci.yml

+43-57
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
format:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1414

1515
steps:
1616
- name: install stable toolchain with rustfmt
@@ -27,7 +27,7 @@ jobs:
2727
args: -- --check
2828

2929
xen:
30-
runs-on: ubuntu-20.04
30+
runs-on: ubuntu-22.04
3131

3232
steps:
3333
- name: install Xen headers and libraries
@@ -52,7 +52,7 @@ jobs:
5252
args: --features xen -- -D warnings
5353

5454
kvm:
55-
runs-on: ubuntu-20.04
55+
runs-on: ubuntu-22.04
5656

5757
steps:
5858
- name: clone libkvmi
@@ -92,45 +92,40 @@ jobs:
9292
uses: actions-rs/cargo@v1
9393
with:
9494
command: clean
95-
- name: install nightly toolchain
96-
uses: actions-rs/toolchain@v1
97-
with:
98-
profile: minimal
99-
toolchain: nightly
100-
override: true
95+
10196
- name: test KVM driver
10297
uses: actions-rs/cargo@v1
10398
with:
10499
command: test
105-
# The target arg is a workaround in order to prevent build.rs files from being compiled with RUSTFLAGS
106-
# -Cpanic=abort can lead to issues with bindgen during compile time
107100
# --lib only unit tests in the library, avoid integration tests
108-
args: --lib --features kvm --no-fail-fast --target x86_64-unknown-linux-gnu
101+
args: --lib --features kvm
109102
env:
110-
CARGO_INCREMENTAL: '0'
111-
RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
112-
RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
103+
RUSTFLAGS: "-Cinstrument-coverage"
104+
LLVM_PROFILE_FILE: "coverage-%p-%m.profraw"
105+
113106
- name: install grcov
114107
uses: actions-rs/[email protected]
115108
with:
116109
crate: grcov
117110
version: latest
118111
use-tool-cache: true
119-
- name: generate coverage report
120-
id: coverage
121-
uses: actions-rs/[email protected]
122-
- name: upload coverage report to codecov.io
123-
uses: codecov/codecov-action@v1
124-
with:
125-
file: ${{ steps.coverage.outputs.report }}
126-
flags: unittests
127-
fail_ci_if_error: true
112+
113+
# - name: generate coverage report
114+
# id: coverage
115+
# uses: actions-rs/[email protected]
116+
117+
# - name: upload coverage report to codecov.io
118+
# uses: codecov/codecov-action@v1
119+
# with:
120+
# file: ${{ steps.coverage.outputs.report }}
121+
# flags: unittests
122+
# fail_ci_if_error: true
128123

129124
memflow:
130125
runs-on: ${{ matrix.os }}
131126
strategy:
132127
matrix:
133-
os: [ ubuntu-20.04, windows-2022 ]
128+
os: [ ubuntu-22.04, windows-2022 ]
134129

135130
steps:
136131
- name: install stable toolchain with clippy
@@ -153,7 +148,7 @@ jobs:
153148
args: --features mflow -- -D warnings
154149

155150
virtualbox_linux:
156-
runs-on: ubuntu-20.04
151+
runs-on: ubuntu-22.04
157152

158153
steps:
159154
- name: clone Icebox repository
@@ -237,7 +232,7 @@ jobs:
237232
runs-on: ${{ matrix.os }}
238233
strategy:
239234
matrix:
240-
os: [ubuntu-20.04, windows-2022]
235+
os: [ubuntu-22.04, windows-2022]
241236

242237
steps:
243238
- name: install stable toolchain
@@ -263,7 +258,7 @@ jobs:
263258
runs-on: ${{ matrix.os }}
264259
strategy:
265260
matrix:
266-
os: [ubuntu-20.04, windows-2022]
261+
os: [ubuntu-22.04, windows-2022]
267262
steps:
268263
- name: install stable toolchain with clippy
269264
uses: actions-rs/toolchain@v1
@@ -284,7 +279,7 @@ jobs:
284279
release_python:
285280
# build a libmicrovmi python bindings release
286281
# and upload it as artifact
287-
runs-on: ubuntu-20.04
282+
runs-on: ubuntu-22.04
288283
steps:
289284
- name: install stable toolchain with clippy
290285
uses: actions-rs/toolchain@v1
@@ -334,7 +329,7 @@ jobs:
334329

335330
# upload all generated wheels *.whl
336331
- name: upload artifact
337-
uses: actions/upload-artifact@v2
332+
uses: actions/upload-artifact@v4
338333
with:
339334
name: python_wheels
340335
path: python/dist/manylinux/*
@@ -343,7 +338,7 @@ jobs:
343338
# create a debian package with libmicrovmi release
344339
# and upload it as artifact
345340
needs: [format, xen, kvm, virtualbox_linux, memflow]
346-
runs-on: ubuntu-20.04
341+
runs-on: ubuntu-22.04
347342

348343
steps:
349344
- uses: actions/checkout@v1
@@ -400,7 +395,7 @@ jobs:
400395
run: cargo deb --no-strip -- --features xen,kvm,virtualbox,mflow
401396

402397
- name: upload artifact
403-
uses: actions/upload-artifact@v2
398+
uses: actions/upload-artifact@v4
404399
with:
405400
name: microvmi_deb
406401
# microvmi_x.x.x_amd64.deb
@@ -466,30 +461,25 @@ jobs:
466461
working-directory: libmicrovmi
467462

468463
- name: upload artifact
469-
uses: actions/upload-artifact@v2
464+
uses: actions/upload-artifact@v4
470465
with:
471466
name: microvmi_win32
472467
path: libmicrovmi/output/*
473468

474469
github_release:
475-
# create a Github release
476-
# only when
477-
# - push on master
478-
# - tag starts with 'v*'
479470
needs: [c_api, examples, release_python, release_debian_package, release_windows]
480-
runs-on: ubuntu-20.04
481-
# output these value to be used by other jobs so they can add assets
471+
runs-on: ubuntu-22.04
482472
outputs:
483473
upload_url: ${{ steps.step_upload_url.outputs.upload_url }}
484474
version: ${{ steps.get_version.outputs.version }}
485475

486476
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
487477
steps:
488-
- uses: actions/checkout@v1
478+
- uses: actions/checkout@v3
489479

490480
- name: Get the version
491481
id: get_version
492-
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
482+
run: echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
493483

494484
- uses: actions/cache@v2
495485
with:
@@ -509,32 +499,27 @@ jobs:
509499
release_name: ${{ steps.get_version.outputs.version }}
510500

511501
- id: step_upload_url
512-
run: echo "::set-output name=upload_url::${{ steps.create_release.outputs.upload_url }}"
502+
run: echo "upload_url=${{ steps.create_release.outputs.upload_url }}" >> $GITHUB_OUTPUT
513503

514504
publish_debian_package:
515-
# publish the debian package in the Github Release
516505
needs: github_release
517-
runs-on: ubuntu-20.04
506+
runs-on: ubuntu-22.04
518507

519508
steps:
520-
# the deploy action below depends on a checkout of the repo
521-
# otherwise it fails trying to remote the 'origin' remote
522-
# https://github.com/JamesIves/github-pages-deploy-action/issues/335
523-
- uses: actions/checkout@v2
509+
- uses: actions/checkout@v3
524510

525-
# download artifacts
526511
- uses: actions/download-artifact@v2
527512
id: download
528513
with:
529514
name: microvmi_deb
530515

531-
- name: get artifact path and name
516+
- name: Get artifact path and name
532517
id: artefact
533518
run: |
534519
PATHNAME=$(find . -maxdepth 1 -name '*.deb')
535-
NAME=$(basename $PATHNAME)
536-
echo ::set-output name=path::${PATHNAME}
537-
echo ::set-output name=name::${NAME}
520+
NAME=$(basename "$PATHNAME")
521+
echo "path=$PATHNAME" >> $GITHUB_OUTPUT
522+
echo "name=$NAME" >> $GITHUB_OUTPUT
538523
539524
- name: Upload Debian package as Release asset
540525
uses: actions/[email protected]
@@ -546,9 +531,10 @@ jobs:
546531
asset_name: ${{ steps.artefact.outputs.name }}
547532
asset_content_type: application/vnd.debian.binary-package
548533

534+
549535
publish_windows:
550536
# publish the windows release on Github Release
551-
runs-on: ubuntu-20.04
537+
runs-on: ubuntu-22.04
552538
needs: github_release
553539
steps:
554540
- uses: actions/checkout@v1
@@ -579,7 +565,7 @@ jobs:
579565
publish_book:
580566
# build and publish the book on Github pages
581567
needs: github_release
582-
runs-on: ubuntu-20.04
568+
runs-on: ubuntu-22.04
583569

584570
steps:
585571
- uses: actions/checkout@v1
@@ -608,7 +594,7 @@ jobs:
608594

609595
publish_crates_io:
610596
needs: github_release
611-
runs-on: ubuntu-20.04
597+
runs-on: ubuntu-22.04
612598

613599
# publish on crates.io
614600
# this should be triggered by cargo release, which creates a new tag and pushes to the repo
@@ -627,7 +613,7 @@ jobs:
627613
628614
publish_pypi:
629615
needs: github_release
630-
runs-on: ubuntu-20.04
616+
runs-on: ubuntu-22.04
631617

632618
steps:
633619
- uses: actions/checkout@v2

0 commit comments

Comments
 (0)