Skip to content

Commit 30eb878

Browse files
ludfjigludfjig
authored
Simplify ci matrix (#78)
Signed-off-by: Ludvig Liljenberg <[email protected]>
1 parent a165293 commit 30eb878

File tree

3 files changed

+18
-97
lines changed

3 files changed

+18
-97
lines changed

‎.github/workflows/Benchmarks.yml‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,12 @@ jobs:
1717
strategy:
1818
fail-fast: true
1919
matrix:
20-
include:
21-
- build: windows-2022-release-amd
22-
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
23-
hypervisor: hyperv
24-
arch: amd
25-
- build: linux-kvm-release-amd
26-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
27-
hypervisor: kvm
28-
arch: amd
29-
- build: linux-mshv-release-amd
30-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
31-
hypervisor: mshv
32-
arch: amd
33-
- build: windows-2022-release-intel
34-
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-intel"]
35-
hypervisor: hyperv
36-
arch: intel
37-
- build: linux-kvm-release-intel
38-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-intel"]
39-
hypervisor: kvm
40-
arch: intel
41-
- build: linux-mshv-release-intel
42-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-intel"]
43-
hypervisor: mshv
44-
arch: intel
20+
hypervisor: [hyperv, mshv, kvm] # hyperv is windows, mshv and kvm are linux
21+
cpu: [amd, intel]
22+
config: [release] # don't want to benchmark debug-builds
4523

46-
runs-on: ${{ matrix.os }}
24+
runs-on: ${{ fromJson(format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]', matrix.hypervisor == 'hyperv' && 'Windows' || 'Linux', matrix.hypervisor == 'hyperv' && 'win2022' || matrix.hypervisor, matrix.cpu)) }}
25+
4726
steps:
4827
### Setup ###
4928

@@ -82,7 +61,7 @@ jobs:
8261
run: git fetch --tags origin
8362

8463
- name: Download benchmarks from most recent release
85-
run: just bench-download ${{ runner.os }} ${{ matrix.hypervisor }} ${{ matrix.arch }} # skip tag parameter to compare to latest stable release
64+
run: just bench-download ${{ runner.os }} ${{ matrix.hypervisor }} ${{ matrix.cpu }} # skip tag parameter to compare to latest stable release
8665
continue-on-error: true
8766
env:
8867
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -92,6 +71,6 @@ jobs:
9271

9372
- uses: actions/upload-artifact@v4
9473
with:
95-
name: benchmarks_${{runner.os}}_${{matrix.hypervisor}}_${{ matrix.arch }}
74+
name: benchmarks_${{runner.os}}_${{matrix.hypervisor}}_${{ matrix.cpu }}
9675
path: ./target/criterion/
9776
if-no-files-found: error

‎.github/workflows/dep_rust.yml‎

Lines changed: 6 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -26,69 +26,11 @@ jobs:
2626
strategy:
2727
fail-fast: true
2828
matrix:
29-
include:
30-
- build: windows-2022-debug-amd
31-
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
32-
hypervisor: hyperv
33-
config: debug
34-
arch: amd
35-
- build: linux-kvm-debug-amd
36-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
37-
hypervisor: kvm
38-
config: debug
39-
arch: amd
40-
- build: linux-mshv-debug-amd
41-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
42-
hypervisor: mshv
43-
config: debug
44-
arch: amd
45-
- build: windows-2022-release-amd
46-
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
47-
hypervisor: hyperv
48-
config: release
49-
arch: amd
50-
- build: linux-kvm-release-amd
51-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
52-
hypervisor: kvm
53-
config: release
54-
arch: amd
55-
- build: linux-mshv-release-amd
56-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
57-
hypervisor: mshv
58-
config: release
59-
arch: amd
60-
- build: windows-2022-debug-intel
61-
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-intel"]
62-
hypervisor: hyperv
63-
config: debug
64-
arch: intel
65-
- build: linux-kvm-debug-intel
66-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-intel"]
67-
hypervisor: kvm
68-
config: debug
69-
arch: intel
70-
- build: linux-mshv-debug-intel
71-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-intel"]
72-
hypervisor: mshv
73-
config: debug
74-
arch: intel
75-
- build: windows-2022-release-intel
76-
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-intel"]
77-
hypervisor: hyperv
78-
config: release
79-
arch: intel
80-
- build: linux-kvm-release-intel
81-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-intel"]
82-
hypervisor: kvm
83-
config: release
84-
arch: intel
85-
- build: linux-mshv-release-intel
86-
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-intel"]
87-
hypervisor: mshv
88-
config: release
89-
arch: intel
90-
91-
runs-on: ${{ matrix.os }}
29+
hypervisor: [hyperv, mshv, kvm] # hyperv is windows, mshv and kvm are linux
30+
cpu: [amd, intel]
31+
config: [debug, release]
32+
33+
runs-on: ${{ fromJson(format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]', matrix.hypervisor == 'hyperv' && 'Windows' || 'Linux', matrix.hypervisor == 'hyperv' && 'win2022' || matrix.hypervisor, matrix.cpu)) }}
9234
steps:
9335
- uses: actions/checkout@v4
9436

@@ -160,7 +102,7 @@ jobs:
160102
run: sudo apt install gh -y
161103

162104
- name: Download benchmarks from "latest"
163-
run: just bench-download ${{ runner.os }} ${{ matrix.hypervisor }} ${{ matrix.arch}} dev-latest # compare to prerelease
105+
run: just bench-download ${{ runner.os }} ${{ matrix.hypervisor }} ${{ matrix.cpu}} dev-latest # compare to prerelease
164106
env:
165107
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
166108
continue-on-error: true

‎Justfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ run-rust-examples-linux target=default-target: (build-rust target) (run-rust-exa
165165
# Downloads the benchmarks result from the given release tag.
166166
# If tag is not given, defaults to latest release
167167
# Options for os: "Windows", or "Linux"
168-
# Options for Linux hypervisor: "kvm", "hyperv"
168+
# Options for Linux hypervisor: "kvm", "mshv"
169169
# Options for Windows hypervisor: "hyperv"
170-
# Options for arch: "amd", "intel"
171-
bench-download os hypervisor arch tag="":
172-
gh release download {{ tag }} -D ./target/ -p benchmarks_{{ os }}_{{ hypervisor }}_{{ arch }}.tar.gz
170+
# Options for cpu: "amd", "intel"
171+
bench-download os hypervisor cpu tag="":
172+
gh release download {{ tag }} -D ./target/ -p benchmarks_{{ os }}_{{ hypervisor }}_{{ cpu }}.tar.gz
173173
mkdir -p target/criterion {{ if os() == "windows" { "-Force" } else { "" } }}
174-
tar -zxvf target/benchmarks_{{ os }}_{{ hypervisor }}_{{ arch }}.tar.gz -C target/criterion/ --strip-components=1
174+
tar -zxvf target/benchmarks_{{ os }}_{{ hypervisor }}_{{ cpu }}.tar.gz -C target/criterion/ --strip-components=1
175175

176176
# Warning: compares to and then OVERWRITES the given baseline
177177
bench-ci baseline target=default-target:

0 commit comments

Comments
 (0)