podman -> docker

llvm · Dec 11, 2024 · cd35ef2 · cd35ef2
1 parent 417ac5f
commit cd35ef2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/build-ci-container-windows.yml b/.github/workflows/build-ci-container-windows.yml
@@ -44,7 +44,7 @@ jobs:
           docker build -t ${{ steps.vars.outputs.container-name-tag }} .
       - name: Save container image
         run: |
-          podman save  ${{ steps.vars.outputs.container-name-tag }} >  ${{ steps.vars.outputs.container-filename }}
+          docker save  ${{ steps.vars.outputs.container-name-tag }} >  ${{ steps.vars.outputs.container-filename }}
       - name: Upload container image
         uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/build-ci-container.yml b/.github/workflows/build-ci-container.yml
@@ -20,7 +20,9 @@ on:
 jobs:
   build-ci-container:
     if: github.repository_owner == 'llvm'
-    runs-on: depot-ubuntu-22.04-16
+    runs-on: llvm-premerge-linux-runners
+    container:
+      image: gcr.io/kaniko-project/executor:debug
     outputs:
       container-name: ${{ steps.vars.outputs.container-name }}
       container-name-tag: ${{ steps.vars.outputs.container-name-tag }}
@@ -57,12 +59,6 @@ jobs:
           path: ${{ steps.vars.outputs.container-filename }}
           retention-days: 14
 
-      - name: Test Container
-        run: |
-          for image in ${{ steps.vars.outputs.container-name-tag }} ${{  steps.vars.outputs.container-name }}; do
-            podman run --rm -it $image /usr/bin/bash -x -c 'printf '\''#include <iostream>\nint main(int argc, char **argv) { std::cout << "Hello\\n"; }'\'' | clang++ -x c++ - && ./a.out | grep Hello'
-          done
-
   push-ci-container:
     if: github.event_name == 'push'
     needs: