From db7a6b87c539812300202187141d4d292809f328 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Thu, 2 Feb 2023 17:36:03 -0500 Subject: [PATCH] revert hosted linux+x86-64 for now --- .github/workflows/build.yml | 2 ++ scripts/get-platform.ts | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2de96fa5..a23dc83c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,7 @@ jobs: outputs: os: ${{ steps.platform.outputs.os }} build-os: ${{ steps.platform.outputs.build-os }} + container: ${{ steps.platform.outputs.container }} test-matrix: ${{ steps.platform.outputs.test-matrix }} steps: - uses: actions/checkout@v3 @@ -34,6 +35,7 @@ jobs: build: runs-on: ${{ fromJson(needs.get-platform.outputs.build-os) }} + container: ${{ fromJson(needs.get-platform.outputs.container) }} needs: [get-platform] steps: - uses: actions/checkout@v3 diff --git a/scripts/get-platform.ts b/scripts/get-platform.ts index 8f422281..e201565d 100755 --- a/scripts/get-platform.ts +++ b/scripts/get-platform.ts @@ -15,6 +15,7 @@ const platform = Deno.env.get("PLATFORM") ?? panic("$PLATFORM not set") let os: string | string[] let buildOs: string | string[] +let container: string | undefined let testMatrix: { os: string | string[], container: string | undefined }[] switch(platform) { @@ -35,11 +36,14 @@ switch(platform) { break case "linux+x86-64": os = "ubuntu-latest" - buildOs = ["self-hosted", "linux", "X64"] + // Using GHA resources for now, until we resolve network issues with our runners + // buildOs = ["self-hosted", "linux", "X64"] + buildOs = os + container = "ghcr.io/teaxyz/infuser:latest" testMatrix = [ { os, container: undefined }, - { os: buildOs, container: undefined }, - { os, container: "ghcr.io/teaxyz/infuser:latest" }, + // { os: buildOs, container: undefined }, + { os, container }, { os, container: "debian:buster-slim" }, ] break @@ -49,6 +53,7 @@ switch(platform) { const output = `os=${JSON.stringify(os)}\n` + `build-os=${JSON.stringify(buildOs)}\n` + + `container=${JSON.stringify(container)}\n` + `test-matrix=${JSON.stringify(testMatrix)}\n` Deno.stdout.write(new TextEncoder().encode(output))