Review comments

Author: tstellar

.github/workflows/build-ci-container.yml

@@ -41,15 +41,15 @@ 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 build -t ${{ steps.vars.outputs.container-name-tag }} -f Dockerfile .
 
+      # Save the container so we have it in case the push fails.  This also
+      # allows us to separate the push step into a different job so we can
+      # maintain minimal permissions while building the container.
       - name: Save container image
         run: |
           podman save  ${{ steps.vars.outputs.container-name-tag }} >  ${{ steps.vars.outputs.container-filename }}
 
-      # 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
-      # maintain minimal permissions while building the container.
       - name: Upload container image
         uses: actions/upload-artifact@v4
         with:

…iners/github-action-ci/stage1.Dockerfile …s/containers/github-action-ci/Dockerfile.github/workflows/containers/github-action-ci/stage1.Dockerfile renamed to .github/workflows/containers/github-action-ci/Dockerfile .github/workflows/containers/github-action-ci/stage1.Dockerfile renamed to .github/workflows/containers/github-action-ci/Dockerfile

@@ -36,7 +36,7 @@ RUN cmake -B ./build -G Ninja ./llvm \
   -DLLVM_DISTRIBUTION_COMPONENTS="lld;compiler-rt;clang-format;scan-build" \
   -DCLANG_DEFAULT_LINKER="lld"
 
-RUN ninja -C ./build stage2-clang-bolt stage2-install-distribution && ninja -C ./build install-distribution && rm -rf ./build
+RUN ninja -C ./build stage2-clang-bolt stage2-install-distribution && ninja -C ./build install-distribution
 
 FROM base