Skip to content

Fix 'download benchmark' workflow #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2024
Merged

Fix 'download benchmark' workflow #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb1d5a7
Fix 'download benchmark' workflow
ludfjig Nov 20, 2024
1c9dfa8
Merge branch 'main' into fix_benchmark_artifact
ludfjig Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .github/workflows/Benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ jobs:
strategy:
fail-fast: true
matrix:
build: [
windows-2022-release-amd,
linux-kvm-release-amd,
linux-hyperv-release-amd,
windows-2022-release-intel,
linux-kvm-release-intel,
linux-hyperv-release-intel,
]
include:
- build: windows-2022-release-amd
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
Expand All @@ -34,9 +26,9 @@ jobs:
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
hypervisor: kvm
arch: amd
- build: linux-hyperv-release-amd
- build: linux-mshv-release-amd
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
hypervisor: hyperv
hypervisor: mshv
arch: amd
- build: windows-2022-release-intel
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-intel"]
Expand All @@ -46,9 +38,9 @@ jobs:
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-intel"]
hypervisor: kvm
arch: intel
- build: linux-hyperv-release-intel
- build: linux-mshv-release-intel
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-intel"]
hypervisor: hyperv
hypervisor: mshv
arch: intel

runs-on: ${{ matrix.os }}
Expand Down
56 changes: 26 additions & 30 deletions .github/workflows/dep_rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,70 +26,66 @@ jobs:
strategy:
fail-fast: true
matrix:
build:
[
windows-2022-debug-amd,
linux-kvm-debug-amd,
linux-hyperv-debug-amd,
windows-2022-release-amd,
linux-kvm-release-amd,
linux-hyperv-release-amd,
windows-2022-debug-intel,
linux-kvm-debug-intel,
linux-hyperv-debug-intel,
windows-2022-release-intel,
linux-kvm-release-intel,
linux-hyperv-release-intel,
]
include:
- build: windows-2022-debug-amd
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
hypervisor: none
hypervisor: hyperv
config: debug
arch: amd
- build: linux-kvm-debug-amd
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
hypervisor: kvm
config: debug
- build: linux-hyperv-debug-amd
arch: amd
- build: linux-mshv-debug-amd
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
hypervisor: hyperv
hypervisor: mshv
config: debug
arch: amd
- build: windows-2022-release-amd
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
hypervisor: none
hypervisor: hyperv
config: release
arch: amd
- build: linux-kvm-release-amd
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
hypervisor: kvm
config: release
- build: linux-hyperv-release-amd
arch: amd
- build: linux-mshv-release-amd
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
hypervisor: hyperv
hypervisor: mshv
config: release
- build: windows-2022-debug-intel
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-intel"]
hypervisor: none
hypervisor: hyperv
config: debug
arch: intel
- build: linux-kvm-debug-intel
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-intel"]
hypervisor: kvm
config: debug
- build: linux-hyperv-debug-intel
arch: intel
- build: linux-mshv-debug-intel
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-intel"]
hypervisor: hyperv
hypervisor: mshv
config: debug
arch: intel
- build: windows-2022-release-intel
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-intel"]
hypervisor: none
hypervisor: hyperv
config: release
arch: intel
- build: linux-kvm-release-intel
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-intel"]
hypervisor: kvm
config: release
- build: linux-hyperv-release-intel
arch: intel
- build: linux-mshv-release-intel
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-intel"]
hypervisor: hyperv
hypervisor: mshv
config: release
arch: intel

runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -133,7 +129,7 @@ jobs:
just test-rust ${{ matrix.config }}

# with only one driver enabled (driver mshv/kvm feature is ignored on windows) + seccomp + inprocess
just test-rust ${{ matrix.config }} inprocess,seccomp,${{ matrix.hypervisor == 'hyperv' && 'mshv' || 'kvm' }}
just test-rust ${{ matrix.config }} inprocess,seccomp,${{ matrix.hypervisor == 'mshv' && 'mshv' || 'kvm' }}

# without any driver (shouldn't compile)
just test-rust-feature-compilation-fail ${{ matrix.config }}
Expand All @@ -155,15 +151,15 @@ jobs:

### Benchmarks ###
- name: Install github-cli (Linux mariner)
if: runner.os == 'Linux' && matrix.hypervisor == 'hyperv'
if: runner.os == 'Linux' && matrix.hypervisor == 'mshv'
run: sudo dnf install gh -y

- name: Install github-cli (Linux ubuntu)
if: runner.os == 'Linux' && matrix.hypervisor == 'kvm'
run: sudo apt install gh -y

- name: Download benchmarks from "latest"
run: just bench-download ${{ runner.os }} ${{ matrix.hypervisor }} dev-latest # compare to prerelease
run: just bench-download ${{ runner.os }} ${{ matrix.hypervisor }} ${{ matrix.arch}} dev-latest # compare to prerelease
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
continue-on-error: true
Expand Down
Loading