Skip to content
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.

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

Update runner pool #4

Merged
merged 5 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 3 additions & 12 deletions .github/workflows/Benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,7 @@ name: Benchmarks

on:
workflow_call: # This is called from CreateRelease.yml
secrets:
ADO_HYPERLIGHT_CARGO_RO_AZURE_CLIENT_ID:
required: true
AZURE_TENANT_ID:
required: true
inputs:
environment:
required: false
type: string

permissions:
id-token: write
Expand All @@ -23,20 +15,19 @@ jobs:
# its execution. this dependency should be expressed in the dependent
# workflow
benchmark:
environment: ${{ inputs.environment }}
strategy:
fail-fast: true
matrix:
build: [windows-2022-release, linux-kvm-release, linux-hyperv-release]
include:
- build: windows-2022-release
os: [self-hosted, Windows, X64, "1ES.Pool=HL-win-2022-amd"]
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
hypervisor: none
- build: linux-kvm-release
os: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
hypervisor: kvm
- build: linux-hyperv-release
os: [self-hosted, Linux, X64, "1ES.Pool=HL-mshv-dev"]
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
hypervisor: hyperv

runs-on: ${{ matrix.os }}
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/CargoPublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,14 @@ name: Publish crates to intenral cargo registry
on:
workflow_dispatch:
workflow_call:
secrets:
ADO_HYPERLIGHT_CARGO_RW_AZURE_CLIENT_ID:
required: true
AZURE_TENANT_ID:
required: true

permissions:
contents: read
id-token: write

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

# We should only publish from dev if minver contains `-preview`
if: ${{ contains(github.ref, 'refs/heads/release/') }} || ${{ github.ref=='refs/heads/dev' }}
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/CreateRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ jobs:
build-rust-ubuntu:
# see https://github.com/orgs/community/discussions/26286#discussioncomment-3251208 for why we need to check the ref
if: ${{ contains(github.ref, 'refs/heads/release/') }} || ${{ github.ref=='refs/heads/dev' }}
runs-on: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
environment: release
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]

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

steps:
- uses: actions/checkout@v4
Expand All @@ -69,22 +67,17 @@ jobs:
build-guest-binaries:
uses: ./.github/workflows/dep_build_guest_binaries.yml
secrets: inherit
with:
environment: release

fuzzing:
uses: ./.github/workflows/dep_fuzzing.yml
with:
max_total_time: 3600 # 1 hour in seconds
environment: release
secrets: inherit

benchmarks:
needs: [build-guest-binaries]
uses: ./.github/workflows/Benchmarks.yml
secrets: inherit
with:
environment: release
permissions:
id-token: write
contents: read
Expand All @@ -98,7 +91,6 @@ jobs:
contents: read

publish:
environment: release
# see https://github.com/orgs/community/discussions/26286#discussioncomment-3251208 for why we need to check the ref
if: ${{ contains(github.ref, 'refs/heads/release/') }} || ${{ github.ref=='refs/heads/dev' }}
runs-on: windows-2022
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ValidatePullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
build: [windows-debug, windows-release]
include:
- build: windows-debug
os: [self-hosted, Windows, X64, "1ES.Pool=HL-win-2022-amd"]
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
config: debug
platform: x64
- build: windows-release
os: [self-hosted, Windows, X64, "1ES.Pool=HL-win-2022-amd"]
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
config: release
platform: x64
env:
Expand Down Expand Up @@ -82,22 +82,22 @@ jobs:
]
include:
- build: linux-kvm-debug
os: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
config: debug
platform: x64
hypervisor: kvm
- build: linux-kvm-release
os: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
config: release
platform: x64
hypervisor: kvm
- build: linux-hyperv-debug
os: [self-hosted, Linux, X64, "1ES.Pool=HL-mshv-dev"]
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
config: debug
platform: x64
hypervisor: hyperv
- build: linux-hyperv-release
os: [self-hosted, Linux, X64, "1ES.Pool=HL-mshv-dev"]
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
config: release
platform: x64
hypervisor: hyperv
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/custom_dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
contents: write # for Git to git push
id-token: write
pull-requests: write # for repo-sync/pull-request to create pull requests
runs-on: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
steps:

- name: Checkout repo
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/dep_build_guest_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,6 @@ name: Build Guest Binaries

on:
workflow_call:
secrets:
ADO_HYPERLIGHT_CARGO_RO_AZURE_CLIENT_ID:
required: true
AZURE_TENANT_ID:
required: true
inputs:
environment:
required: false
type: string

env:
CARGO_TERM_COLOR: always
Expand All @@ -24,7 +15,6 @@ permissions:
jobs:
# this job has no dependencies
build-guest-binaries:
environment: ${{ inputs.environment }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/dep_fuzzing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,14 @@ on:
description: Maximum total time for the fuzz run in seconds
required: true
type: number
environment:
required: false
type: string

permissions:
id-token: write
contents: read

jobs:
fuzz:
environment: ${{ inputs.environment }}
runs-on: [ self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM" ]
runs-on: [ self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd" ]
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
17 changes: 6 additions & 11 deletions .github/workflows/dep_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ name: Rust Tests and Lints
# See README.md in this directory for more information about workflow_call
on:
workflow_call:
secrets:
ADO_HYPERLIGHT_CARGO_RO_AZURE_CLIENT_ID:
required: true
AZURE_TENANT_ID:
required: true

env:
CARGO_TERM_COLOR: always
Expand All @@ -35,27 +30,27 @@ jobs:
]
include:
- build: windows-2022-debug
os: [self-hosted, Windows, X64, "1ES.Pool=HL-win-2022-amd"]
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
hypervisor: none
config: debug
- build: linux-kvm-debug
os: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
hypervisor: kvm
config: debug
- build: linux-hyperv-debug
os: [self-hosted, Linux, X64, "1ES.Pool=HL-mshv-dev"]
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
hypervisor: hyperv
config: debug
- build: windows-2022-release
os: [self-hosted, Windows, X64, "1ES.Pool=HL-win-2022-amd"]
os: [self-hosted, Windows, X64, "1ES.Pool=hld-win2022-amd"]
hypervisor: none
config: release
- build: linux-kvm-release
os: [self-hosted, Linux, X64, "1ES.Pool=HL-Ubuntu-22.04-KVM"]
os: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
hypervisor: kvm
config: release
- build: linux-hyperv-release
os: [self-hosted, Linux, X64, "1ES.Pool=HL-mshv-dev"]
os: [self-hosted, Linux, X64, "1ES.Pool=hld-mshv-amd"]
hypervisor: hyperv
config: release

Expand Down
12 changes: 7 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
mono_crash.*

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
**/[Dd]ebug/*
/[Dd]ebugPublic/
**/[Rr]elease/*
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Bb]in/*
[Oo]bj/
[Ll]og/
[Ll]ogs/
Expand Down Expand Up @@ -472,4 +472,6 @@ hyperlight_guest.h
.pem

# created by vs code c# extension
.mono
.mono

!.gitkeep
Empty file modified dev/verify-msrv.sh
100644 → 100755
Empty file.
Empty file added src/tests/c_guests/bin/.gitkeep
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Loading