diff --git a/.github/workflows/qa-azure.yaml b/.github/workflows/qa-azure.yaml index b23cacfaf..cc4603965 100644 --- a/.github/workflows/qa-azure.yaml +++ b/.github/workflows/qa-azure.yaml @@ -17,7 +17,7 @@ env: jobs: build-wsl-pro-service: name: Build wsl-pro-service debian package - runs-on: ubuntu-latest + runs-on: ["self-hosted", "Linux", "jammy", "X64", "small"] steps: - name: Check out repository uses: actions/checkout@v4 @@ -170,7 +170,7 @@ jobs: # Uninstall Appx Get-AppxPackage -Name "CanonicalGroupLimited.UbuntuProForWindows" | Remove-AppxPackage -ErrorAction Ignore - + # Uninstall certificate $thumbprint = (Get-PfxCertificate -FilePath "ci-artifacts\windows-agent\UbuntuProForWindows_*.cer").Thumbprint Remove-Item -Path "Cert:LocalMachine\TrustedPeople\${thumbprint}" diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index a8c878969..7e10b7baa 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -36,7 +36,7 @@ jobs: - os: ubuntu subproject: end-to-end - runs-on: ${{ matrix.os }}-latest + runs-on: ${{ matrix.os == 'ubuntu' && fromJson('["self-hosted", "Linux", "jammy", "X64", "small"]') || 'windows-latest' }} steps: - name: Set up git # This step needs to be done before checkout so that the checkout respects clrf @@ -98,7 +98,7 @@ jobs: matrix: os: [ubuntu, windows] package: ["gui/packages/p4w_ms_store", "gui/packages/ubuntupro"] - runs-on: ${{ matrix.os }}-latest + runs-on: ${{ matrix.os == 'ubuntu' && fromJson('["self-hosted", "Linux", "jammy", "X64", "small"]') || 'windows-latest' }} steps: - name: Set up git # This step needs to be done before checkout so that the checkout respects clrf @@ -137,7 +137,7 @@ jobs: # such as the dependency on xvfb since ubuntu runners on GH don't have graphical capabilities. matrix: os: [windows] - runs-on: ${{ matrix.os }}-latest + runs-on: ${{ matrix.os == 'ubuntu' && fromJson('["self-hosted", "Linux", "jammy", "X64", "small"]') || 'windows-latest' }} steps: - name: Set up git # This step needs to be done before checkout so that the checkout respects clrf @@ -190,7 +190,7 @@ jobs: # Excluded because microsoftstore_test needs msbuild - os: ubuntu subproject: "storeapi/go-wrapper/microsoftstore" - runs-on: ${{ matrix.os }}-latest + runs-on: ${{ matrix.os == 'ubuntu' && fromJson('["self-hosted", "Linux", "jammy", "X64", "small"]') || 'windows-latest' }} steps: - name: Check out repository uses: actions/checkout@v4 @@ -227,7 +227,7 @@ jobs: generated-grpc: name: gRPC files are up to date - runs-on: ubuntu-latest + runs-on: ["self-hosted", "Linux", "jammy", "X64", "small"] container: ubuntu:rolling strategy: fail-fast: false