Skip to content

Commit 5de98c4

Browse files
committed
[Github] Install make on Windows container
1 parent 928393b commit 5de98c4

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ on:
1717

1818
jobs:
1919
build-ci-container-windows:
20-
if: github.repository_owner == 'llvm'
20+
# if: github.repository_owner == 'llvm'
2121
runs-on: windows-2022
22+
permissions:
23+
packages: write
2224
outputs:
2325
container-name: ${{ steps.vars.outputs.container-name }}
2426
container-name-tag: ${{ steps.vars.outputs.container-name-tag }}
@@ -32,23 +34,29 @@ jobs:
3234
id: vars
3335
run: |
3436
$tag = [int64](Get-Date -UFormat %s)
35-
$container_name="ghcr.io/$env:GITHUB_REPOSITORY_OWNER/ci-windows-2022"
37+
$container_name="ghcr.io/$($env:GITHUB_REPOSITORY_OWNER.ToLower())/ci-windows-2022"
3638
echo "container-name=${container_name}" >> $env:GITHUB_OUTPUT
3739
echo "container-name-tag=${container_name}:${tag}" >> $env:GITHUB_OUTPUT
3840
echo "container-filename=ci-windows-${tag}.tar" >> $env:GITHUB_OUTPUT
3941
- name: Build Container
4042
working-directory: .github/workflows/containers/github-action-ci-windows
43+
env:
44+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4145
run: |
4246
docker build -t ${{ steps.vars.outputs.container-name-tag }} .
43-
- name: Save container image
44-
run: |
45-
docker save ${{ steps.vars.outputs.container-name-tag }} > ${{ steps.vars.outputs.container-filename }}
46-
- name: Upload container image
47-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
48-
with:
49-
name: container
50-
path: ${{ steps.vars.outputs.container-filename }}
51-
retention-days: 14
47+
docker tag ${{ steps.vars.outputs.container-name-tag }} ${{ steps.vars.outputs.container-name }}:latest
48+
docker login -u ${{ github.actor }} -p $env:GITHUB_TOKEN ghcr.io
49+
docker push ${{ steps.vars.outputs.container-name-tag }}
50+
docker push ${{ steps.vars.outputs.container-name }}:latest
51+
# - name: Save container image
52+
# run: |
53+
# docker save ${{ steps.vars.outputs.container-name-tag }} > ${{ steps.vars.outputs.container-filename }}
54+
# - name: Upload container image
55+
# uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
56+
# with:
57+
# name: container
58+
# path: ${{ steps.vars.outputs.container-filename }}
59+
# retention-days: 14
5260

5361
push-ci-container:
5462
if: github.event_name == 'push'

.github/workflows/containers/github-action-ci-windows/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ RUN regsvr32 /S "C:\BuildTools\DIA SDK\bin\amd64\msdia140.dll" & \
4848
RUN choco install -y ninja --version 1.13.1 && \
4949
choco install -y git --version 2.50.1 && \
5050
choco install -y sccache --version 0.10.0 && \
51-
choco install -y python3 --version 3.9.7
51+
choco install -y python3 --version 3.9.7 && \
52+
choco install -y make
5253

5354
# Testing requires psutil
5455
RUN pip install psutil

0 commit comments

Comments
 (0)