Skip to content

Commit c3ca96b

Browse files
simongdaviessimongdavies
committed
Merge branch 'dev' into update-dependabot
Signed-off-by: Simon Davies <[email protected]>
2 parents 3c59e89 + 4bed8e8 commit c3ca96b

File tree

15 files changed

+25
-65
lines changed

15 files changed

+25
-65
lines changed

‎.github/workflows/Benchmarks.yml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,7 @@ name: Benchmarks
44

55
on:
66
workflow_call: # This is called from CreateRelease.yml
7-
secrets:
8-
ADO_HYPERLIGHT_CARGO_RO_AZURE_CLIENT_ID:
9-
required: true
10-
AZURE_TENANT_ID:
11-
required: true
127
inputs:
13-
environment:
14-
required: false
15-
type: string
168

179
permissions:
1810
id-token: write
@@ -23,20 +15,19 @@ jobs:
2315
# its execution. this dependency should be expressed in the dependent
2416
# workflow
2517
benchmark:
26-
environment: ${{ inputs.environment }}
2718
strategy:
2819
fail-fast: true
2920
matrix:
3021
build: [windows-2022-release, linux-kvm-release, linux-hyperv-release]
3122
include:
3223
- build: windows-2022-release
33-
os: [self-hosted, Windows, X64, "1ES.Pool=HL-win-2022-amd"]
24+
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
3425
hypervisor: none
3526
- build: linux-kvm-release
36-
os: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
27+
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
3728
hypervisor: kvm
3829
- build: linux-hyperv-release
39-
os: [self-hosted, Linux, X64, "1ES.Pool=HL-mshv-dev"]
30+
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
4031
hypervisor: hyperv
4132

4233
runs-on: ${{ matrix.os }}

‎.github/workflows/CargoPublish.yml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,14 @@ name: Publish crates to intenral cargo registry
55
on:
66
workflow_dispatch:
77
workflow_call:
8-
secrets:
9-
ADO_HYPERLIGHT_CARGO_RW_AZURE_CLIENT_ID:
10-
required: true
11-
AZURE_TENANT_ID:
12-
required: true
138

149
permissions:
1510
contents: read
1611
id-token: write
1712

1813
jobs:
1914
publish-hyperlight-packages:
20-
environment: release
21-
runs-on: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
15+
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
2216

2317
# We should only publish from dev if minver contains `-preview`
2418
if: ${{ contains(github.ref, 'refs/heads/release/') }} || ${{ github.ref=='refs/heads/dev' }}

‎.github/workflows/CreateRelease.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ jobs:
1818
build-rust-ubuntu:
1919
# see https://github.com/orgs/community/discussions/26286#discussioncomment-3251208 for why we need to check the ref
2020
if: ${{ contains(github.ref, 'refs/heads/release/') }} || ${{ github.ref=='refs/heads/dev' }}
21-
runs-on: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
22-
environment: release
21+
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
2322

2423
steps:
2524
- uses: actions/checkout@v4
@@ -49,7 +48,6 @@ jobs:
4948
# see https://github.com/orgs/community/discussions/26286#discussioncomment-3251208 for why we need to check the ref
5049
if: ${{ contains(github.ref, 'refs/heads/release/') }} || ${{ github.ref=='refs/heads/dev' }}
5150
runs-on: windows-2022
52-
environment: release
5351

5452
steps:
5553
- uses: actions/checkout@v4
@@ -69,22 +67,17 @@ jobs:
6967
build-guest-binaries:
7068
uses: ./.github/workflows/dep_build_guest_binaries.yml
7169
secrets: inherit
72-
with:
73-
environment: release
7470

7571
fuzzing:
7672
uses: ./.github/workflows/dep_fuzzing.yml
7773
with:
7874
max_total_time: 3600 # 1 hour in seconds
79-
environment: release
8075
secrets: inherit
8176

8277
benchmarks:
8378
needs: [build-guest-binaries]
8479
uses: ./.github/workflows/Benchmarks.yml
8580
secrets: inherit
86-
with:
87-
environment: release
8881
permissions:
8982
id-token: write
9083
contents: read
@@ -98,7 +91,6 @@ jobs:
9891
contents: read
9992

10093
publish:
101-
environment: release
10294
# see https://github.com/orgs/community/discussions/26286#discussioncomment-3251208 for why we need to check the ref
10395
if: ${{ contains(github.ref, 'refs/heads/release/') }} || ${{ github.ref=='refs/heads/dev' }}
10496
runs-on: windows-2022

‎.github/workflows/ValidatePullRequest.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ jobs:
3333
build: [windows-debug, windows-release]
3434
include:
3535
- build: windows-debug
36-
os: [self-hosted, Windows, X64, "1ES.Pool=HL-win-2022-amd"]
36+
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
3737
config: debug
3838
platform: x64
3939
- build: windows-release
40-
os: [self-hosted, Windows, X64, "1ES.Pool=HL-win-2022-amd"]
40+
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
4141
config: release
4242
platform: x64
4343
env:
@@ -82,22 +82,22 @@ jobs:
8282
]
8383
include:
8484
- build: linux-kvm-debug
85-
os: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
85+
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
8686
config: debug
8787
platform: x64
8888
hypervisor: kvm
8989
- build: linux-kvm-release
90-
os: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
90+
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
9191
config: release
9292
platform: x64
9393
hypervisor: kvm
9494
- build: linux-hyperv-debug
95-
os: [self-hosted, Linux, X64, "1ES.Pool=HL-mshv-dev"]
95+
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
9696
config: debug
9797
platform: x64
9898
hypervisor: hyperv
9999
- build: linux-hyperv-release
100-
os: [self-hosted, Linux, X64, "1ES.Pool=HL-mshv-dev"]
100+
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
101101
config: release
102102
platform: x64
103103
hypervisor: hyperv

‎.github/workflows/dep_build_guest_binaries.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ name: Build Guest Binaries
44

55
on:
66
workflow_call:
7-
secrets:
8-
ADO_HYPERLIGHT_CARGO_RO_AZURE_CLIENT_ID:
9-
required: true
10-
AZURE_TENANT_ID:
11-
required: true
12-
inputs:
13-
environment:
14-
required: false
15-
type: string
167

178
env:
189
CARGO_TERM_COLOR: always
@@ -24,7 +15,6 @@ permissions:
2415
jobs:
2516
# this job has no dependencies
2617
build-guest-binaries:
27-
environment: ${{ inputs.environment }}
2818
runs-on: ${{ matrix.os }}
2919
strategy:
3020
fail-fast: true

‎.github/workflows/dep_fuzzing.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,14 @@ on:
77
description: Maximum total time for the fuzz run in seconds
88
required: true
99
type: number
10-
environment:
11-
required: false
12-
type: string
1310

1411
permissions:
1512
id-token: write
1613
contents: read
1714

1815
jobs:
1916
fuzz:
20-
environment: ${{ inputs.environment }}
21-
runs-on: [ self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM" ]
17+
runs-on: [ self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd" ]
2218
steps:
2319
- name: Checkout code
2420
uses: actions/checkout@v4

‎.github/workflows/dep_rust.yml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ name: Rust Tests and Lints
55
# See README.md in this directory for more information about workflow_call
66
on:
77
workflow_call:
8-
secrets:
9-
ADO_HYPERLIGHT_CARGO_RO_AZURE_CLIENT_ID:
10-
required: true
11-
AZURE_TENANT_ID:
12-
required: true
138

149
env:
1510
CARGO_TERM_COLOR: always
@@ -35,27 +30,27 @@ jobs:
3530
]
3631
include:
3732
- build: windows-2022-debug
38-
os: [self-hosted, Windows, X64, "1ES.Pool=HL-win-2022-amd"]
33+
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
3934
hypervisor: none
4035
config: debug
4136
- build: linux-kvm-debug
42-
os: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
37+
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
4338
hypervisor: kvm
4439
config: debug
4540
- build: linux-hyperv-debug
46-
os: [self-hosted, Linux, X64, "1ES.Pool=HL-mshv-dev"]
41+
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
4742
hypervisor: hyperv
4843
config: debug
4944
- build: windows-2022-release
50-
os: [self-hosted, Windows, X64, "1ES.Pool=HL-win-2022-amd"]
45+
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
5146
hypervisor: none
5247
config: release
5348
- build: linux-kvm-release
54-
os: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
49+
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
5550
hypervisor: kvm
5651
config: release
5752
- build: linux-hyperv-release
58-
os: [self-hosted, Linux, X64, "1ES.Pool=HL-mshv-dev"]
53+
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
5954
hypervisor: hyperv
6055
config: release
6156

‎.gitignore‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
mono_crash.*
1818

1919
# Build results
20-
[Dd]ebug/
21-
[Dd]ebugPublic/
22-
[Rr]elease/
20+
**/[Dd]ebug/*
21+
/[Dd]ebugPublic/
22+
**/[Rr]elease/*
2323
[Rr]eleases/
2424
x64/
2525
x86/
2626
[Ww][Ii][Nn]32/
2727
[Aa][Rr][Mm]/
2828
[Aa][Rr][Mm]64/
2929
bld/
30-
[Bb]in/
30+
[Bb]in/*
3131
[Oo]bj/
3232
[Ll]og/
3333
[Ll]ogs/
@@ -472,4 +472,6 @@ hyperlight_guest.h
472472
.pem
473473

474474
# created by vs code c# extension
475-
.mono
475+
.mono
476+
477+
!.gitkeep

‎dev/verify-msrv.sh‎

100644100755
File mode changed.

‎src/tests/c_guests/bin/.gitkeep‎

Whitespace-only changes.

0 commit comments

Comments
 (0)