Skip to content

workflows/build-ci-container-windows: Remove template expansion#200097

Merged
tstellar merged 3 commits into
llvm:mainfrom
tstellar:build-ci-template
May 29, 2026
Merged

workflows/build-ci-container-windows: Remove template expansion#200097
tstellar merged 3 commits into
llvm:mainfrom
tstellar:build-ci-template

Conversation

@tstellar tstellar marked this pull request as ready for review May 29, 2026 12:42
@tstellar tstellar requested a review from boomanaiden154 May 29, 2026 12:42
@llvmorg-github-actions
Copy link
Copy Markdown

@llvm/pr-subscribers-github-workflow

Author: Tom Stellard (tstellar)

Changes

https://github.com/llvm/llvm-project/security/code-scanning/1580 https://github.com/llvm/llvm-project/security/code-scanning/1581 https://github.com/llvm/llvm-project/security/code-scanning/1582 https://github.com/llvm/llvm-project/security/code-scanning/1583 https://github.com/llvm/llvm-project/security/code-scanning/1584 https://github.com/llvm/llvm-project/security/code-scanning/1585 https://github.com/llvm/llvm-project/security/code-scanning/1586 https://github.com/llvm/llvm-project/security/code-scanning/1587


Full diff: https://github.com/llvm/llvm-project/pull/200097.diff

1 Files Affected:

  • (modified) .github/workflows/build-ci-container-windows.yml (+16-7)
diff --git a/.github/workflows/build-ci-container-windows.yml b/.github/workflows/build-ci-container-windows.yml
index 461385810f2f8..4221562e2da68 100644
--- a/.github/workflows/build-ci-container-windows.yml
+++ b/.github/workflows/build-ci-container-windows.yml
@@ -39,11 +39,16 @@ jobs:
           echo "container-filename=ci-windows-${tag}.tar" >> $env:GITHUB_OUTPUT
       - name: Build Container
         working-directory: .github/workflows/containers/github-action-ci-windows
+        env:
+          CONTAINER_NAME_TAG: ${{ steps.vars.outputs.container-name-tag }}
         run: |
-          docker build -t ${{ steps.vars.outputs.container-name-tag }} .
+          docker build -t $env:CONTAINER_NAME_TAG .
       - name: Save container image
+        env:
+          CONTAINER_NAME_TAG: ${{ steps.vars.outputs.container-name-tag }}
+          CONTAINER_FILENAME: ${{ steps.vars.outputs.container-filename }}
         run: |
-          docker save  ${{ steps.vars.outputs.container-name-tag }} >  ${{ steps.vars.outputs.container-filename }}
+          docker save  $env:CONTAINER_NAME_TAG > $env:CONTAINER_FILENAME
       - name: Upload container image
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
@@ -66,13 +71,17 @@ jobs:
         with:
           name: container
       - name: Push Container
+        env:
+          CONTAINER_FILENAME: ${{ needs.build-ci-container-windows.outputs.container-filename }}
+          CONTAINER_NAME_TAG: ${{ needs.build-ci-container-windows.outputs.container-name-tag }}
+          CONTAINER_NAME: ${{ needs.build-ci-container-windows.outputs.container-name }}
         run: |
           sudo apt-get update
           sudo apt-get install -y skopeo
-          skopeo login -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }} ghcr.io
-          skopeo copy docker-archive:${{ needs.build-ci-container-windows.outputs.container-filename }} \
+          skopeo login -u $GITHUB_ACTOR -p ${{ secrets.GITHUB_TOKEN }} ghcr.io
+          skopeo copy docker-archive:$CONTAINER_FILENAME \
             --dest-compress-format zstd \
-            docker://${{ needs.build-ci-container-windows.outputs.container-name-tag }}
-          skopeo copy docker-archive:${{ needs.build-ci-container-windows.outputs.container-filename }} \
+            docker://$CONTAINER_NAME_TAG
+          skopeo copy docker-archive:$CONTAINER_FILENAME \
             --dest-compress-format zstd \
-            docker://${{ needs.build-ci-container-windows.outputs.container-name }}:latest
+            docker://$CONTAINER_NAME:latest

Copy link
Copy Markdown
Contributor

@boomanaiden154 boomanaiden154 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@tstellar tstellar merged commit a3241c5 into llvm:main May 29, 2026
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants