diff --git a/.github/workflows/Benchmarks.yml b/.github/workflows/Benchmarks.yml index 8b2d56e8..f19cf604 100644 --- a/.github/workflows/Benchmarks.yml +++ b/.github/workflows/Benchmarks.yml @@ -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 @@ -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 }} diff --git a/.github/workflows/CargoPublish.yml b/.github/workflows/CargoPublish.yml index 61f2357f..3620d31b 100644 --- a/.github/workflows/CargoPublish.yml +++ b/.github/workflows/CargoPublish.yml @@ -5,11 +5,6 @@ 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 @@ -17,8 +12,7 @@ permissions: 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' }} diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml index f3d91638..990036db 100644 --- a/.github/workflows/CreateRelease.yml +++ b/.github/workflows/CreateRelease.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/ValidatePullRequest.yml b/.github/workflows/ValidatePullRequest.yml index e5d29dbc..0191582b 100644 --- a/.github/workflows/ValidatePullRequest.yml +++ b/.github/workflows/ValidatePullRequest.yml @@ -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: @@ -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 diff --git a/.github/workflows/custom_dependabot.yml b/.github/workflows/custom_dependabot.yml index c3f81cc8..b820bd06 100644 --- a/.github/workflows/custom_dependabot.yml +++ b/.github/workflows/custom_dependabot.yml @@ -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 diff --git a/.github/workflows/dep_build_guest_binaries.yml b/.github/workflows/dep_build_guest_binaries.yml index 4aeffb46..220e529a 100644 --- a/.github/workflows/dep_build_guest_binaries.yml +++ b/.github/workflows/dep_build_guest_binaries.yml @@ -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 @@ -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 diff --git a/.github/workflows/dep_fuzzing.yml b/.github/workflows/dep_fuzzing.yml index 9097ef99..03c874e6 100644 --- a/.github/workflows/dep_fuzzing.yml +++ b/.github/workflows/dep_fuzzing.yml @@ -7,9 +7,6 @@ on: description: Maximum total time for the fuzz run in seconds required: true type: number - environment: - required: false - type: string permissions: id-token: write @@ -17,8 +14,7 @@ permissions: 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 diff --git a/.github/workflows/dep_rust.yml b/.github/workflows/dep_rust.yml index 957f8685..b3ab57a4 100644 --- a/.github/workflows/dep_rust.yml +++ b/.github/workflows/dep_rust.yml @@ -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 @@ -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 diff --git a/.gitignore b/.gitignore index df528c62..3a2238ee 100644 --- a/.gitignore +++ b/.gitignore @@ -17,9 +17,9 @@ mono_crash.* # Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ +**/[Dd]ebug/* +/[Dd]ebugPublic/ +**/[Rr]elease/* [Rr]eleases/ x64/ x86/ @@ -27,7 +27,7 @@ x86/ [Aa][Rr][Mm]/ [Aa][Rr][Mm]64/ bld/ -[Bb]in/ +[Bb]in/* [Oo]bj/ [Ll]og/ [Ll]ogs/ @@ -472,4 +472,6 @@ hyperlight_guest.h .pem # created by vs code c# extension -.mono \ No newline at end of file +.mono + +!.gitkeep \ No newline at end of file diff --git a/dev/verify-msrv.sh b/dev/verify-msrv.sh old mode 100644 new mode 100755 diff --git a/src/tests/c_guests/bin/.gitkeep b/src/tests/c_guests/bin/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/tests/c_guests/bin/debug/.gitkeep b/src/tests/c_guests/bin/debug/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/tests/c_guests/bin/release/.gitkeep b/src/tests/c_guests/bin/release/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/tests/rust_guests/bin/.gitkeep b/src/tests/rust_guests/bin/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/tests/rust_guests/bin/debug/.gitkeep b/src/tests/rust_guests/bin/debug/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/tests/rust_guests/bin/release/.gitkeep b/src/tests/rust_guests/bin/release/.gitkeep new file mode 100644 index 00000000..e69de29b