From 6f397cf1a0d6ce03535031afc7c754e8c0b175f2 Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Fri, 9 May 2025 13:31:57 -0700 Subject: [PATCH 1/2] Trying to run out ci workflow in a wsl instance --- .github/workflows/dep_rust.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dep_rust.yml b/.github/workflows/dep_rust.yml index 44e9aca46..7766ba9c2 100644 --- a/.github/workflows/dep_rust.yml +++ b/.github/workflows/dep_rust.yml @@ -36,15 +36,21 @@ jobs: strategy: fail-fast: true matrix: - hypervisor: [hyperv, mshv, mshv3, kvm] # hyperv is windows, mshv and kvm are linux + hypervisor: [hyperv, mshv, mshv3, kvm, wsl] # hyperv is windows, mshv and kvm are linux, wsl is kvm running in WSL(2) on Windows cpu: [amd, intel] config: [debug, release] + # TODO: clean this up after testing by tagging wsl runners with 'hld-wsl-kvm' instead of just 'wsl' runs-on: ${{ fromJson( - format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]', - matrix.hypervisor == 'hyperv' && 'Windows' || 'Linux', - matrix.hypervisor == 'hyperv' && 'win2022' || matrix.hypervisor == 'mshv3' && 'azlinux3-mshv' || matrix.hypervisor, - matrix.cpu)) }} + format('["self-hosted", "{0}", "X64", "{1}"]', + matrix.hypervisor == 'hyperv' && 'Windows' || + matrix.hypervisor == 'wsl' && 'Linux' || + 'Linux', + matrix.hypervisor == 'hyperv' && '1ES.Pool=hld-win2022-{0}' || + matrix.hypervisor == 'mshv3' && '1ES.Pool=hld-azlinux3-mshv-{0}' || + matrix.hypervisor == 'wsl' && 'wsl' || + format('1ES.Pool=hld-{0}-{1}', matrix.hypervisor, matrix.cpu), + matrix.cpu)) }} steps: - uses: actions/checkout@v4 From 6dc1e252795a71a47ef170ef0424513948d6b171 Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Fri, 9 May 2025 15:49:19 -0700 Subject: [PATCH 2/2] retrigger ci --- .github/workflows/dep_rust.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dep_rust.yml b/.github/workflows/dep_rust.yml index 7766ba9c2..ef633d6da 100644 --- a/.github/workflows/dep_rust.yml +++ b/.github/workflows/dep_rust.yml @@ -43,14 +43,13 @@ jobs: # TODO: clean this up after testing by tagging wsl runners with 'hld-wsl-kvm' instead of just 'wsl' runs-on: ${{ fromJson( format('["self-hosted", "{0}", "X64", "{1}"]', - matrix.hypervisor == 'hyperv' && 'Windows' || - matrix.hypervisor == 'wsl' && 'Linux' || - 'Linux', + matrix.hypervisor == 'hyperv' && 'Windows' || 'Linux', matrix.hypervisor == 'hyperv' && '1ES.Pool=hld-win2022-{0}' || matrix.hypervisor == 'mshv3' && '1ES.Pool=hld-azlinux3-mshv-{0}' || matrix.hypervisor == 'wsl' && 'wsl' || format('1ES.Pool=hld-{0}-{1}', matrix.hypervisor, matrix.cpu), matrix.cpu)) }} + steps: - uses: actions/checkout@v4