From 24b33e5be9bb1f7f65f6fc72b3eba218c35d2d1e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 23 Nov 2024 14:28:08 +0000 Subject: [PATCH] Revert Debug patches. This reverts commit 5ed7ba6fc2a81f51a30c6089a31c89521a37b5dd. This reverts commit 7985506181f09fbe54698ac811541e509070ef58. This reverts commit 63e0fc6c3598668a7f54891ec400664d7b240414. --- .github/workflows/build-ci-container.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-ci-container.yml b/.github/workflows/build-ci-container.yml index 99374879f14f21..ddd0a2086f20fe 100644 --- a/.github/workflows/build-ci-container.yml +++ b/.github/workflows/build-ci-container.yml @@ -20,7 +20,7 @@ on: jobs: build-ci-container: if: github.repository_owner == 'llvm' - runs-on: depot-ubuntu-24.04 + runs-on: depot-ubuntu-24.04-16 outputs: container-name: ${{ steps.vars.outputs.container-name }} container-name-tag: ${{ steps.vars.outputs.container-name-tag }} @@ -41,13 +41,11 @@ jobs: - name: Build container working-directory: ./.github/workflows/containers/github-action-ci/ run: | - #podman build -t ${{ steps.vars.outputs.container-name-tag }} -f stage1.Dockerfile . - podman pull docker.io/library/ubuntu:22.04 - podman tag docker.io/library/ubuntu:22.04 ${{ steps.vars.outputs.container-name-tag }} + podman build -t ${{ steps.vars.outputs.container-name-tag }} -f stage1.Dockerfile . - name: Save container image run: | - podman save ${{ steps.vars.outputs.container-name-tag }} > ${{ steps.vars.outputs.container-filename }} + podman save ${{ steps.vars.outputs.container-name-tag }} > ${{ steps.vars.outputs.container-filename }}.tar # Upload the container so we have it in case the push fails. This also # allows us to separate the push step into a separate job so we can