revert hosted linux+x86-64 for now

This commit is contained in:
Jacob Heider 2023-02-02 17:36:03 -05:00
parent a2da161839
commit db7a6b87c5
No known key found for this signature in database
GPG key ID: A98011B5713535BF
2 changed files with 10 additions and 3 deletions

View file

@ -20,6 +20,7 @@ jobs:
outputs: outputs:
os: ${{ steps.platform.outputs.os }} os: ${{ steps.platform.outputs.os }}
build-os: ${{ steps.platform.outputs.build-os }} build-os: ${{ steps.platform.outputs.build-os }}
container: ${{ steps.platform.outputs.container }}
test-matrix: ${{ steps.platform.outputs.test-matrix }} test-matrix: ${{ steps.platform.outputs.test-matrix }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -34,6 +35,7 @@ jobs:
build: build:
runs-on: ${{ fromJson(needs.get-platform.outputs.build-os) }} runs-on: ${{ fromJson(needs.get-platform.outputs.build-os) }}
container: ${{ fromJson(needs.get-platform.outputs.container) }}
needs: [get-platform] needs: [get-platform]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View file

@ -15,6 +15,7 @@ const platform = Deno.env.get("PLATFORM") ?? panic("$PLATFORM not set")
let os: string | string[] let os: string | string[]
let buildOs: string | string[] let buildOs: string | string[]
let container: string | undefined
let testMatrix: { os: string | string[], container: string | undefined }[] let testMatrix: { os: string | string[], container: string | undefined }[]
switch(platform) { switch(platform) {
@ -35,11 +36,14 @@ switch(platform) {
break break
case "linux+x86-64": case "linux+x86-64":
os = "ubuntu-latest" 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 = [ testMatrix = [
{ os, container: undefined }, { os, container: undefined },
{ os: buildOs, container: undefined }, // { os: buildOs, container: undefined },
{ os, container: "ghcr.io/teaxyz/infuser:latest" }, { os, container },
{ os, container: "debian:buster-slim" }, { os, container: "debian:buster-slim" },
] ]
break break
@ -49,6 +53,7 @@ switch(platform) {
const output = `os=${JSON.stringify(os)}\n` + const output = `os=${JSON.stringify(os)}\n` +
`build-os=${JSON.stringify(buildOs)}\n` + `build-os=${JSON.stringify(buildOs)}\n` +
`container=${JSON.stringify(container)}\n` +
`test-matrix=${JSON.stringify(testMatrix)}\n` `test-matrix=${JSON.stringify(testMatrix)}\n`
Deno.stdout.write(new TextEncoder().encode(output)) Deno.stdout.write(new TextEncoder().encode(output))