Skip to content

Commit

Permalink
Add cc.exe copy (#231)
Browse files Browse the repository at this point in the history
We use `cc` to check if the image is functioning properly.  Let's copy
the same check here.
  • Loading branch information
staticfloat authored Sep 20, 2022
1 parent 0ca656a commit ff8338e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

# Dump some debugging output to ensure everything works properly
- run: docker images ${{ env.IMAGE_NAME }} --digests
- run: docker run ${{ env.IMAGE_NAME }} bash -c "gcc -dumpmachine; gcc --version"
- run: docker run ${{ env.IMAGE_NAME }} bash -c "cc -dumpmachine; cc --version"

# Login to docker hub so we can push it up, but only do so on a tag
- name: Login to Docker Hub
Expand Down
3 changes: 2 additions & 1 deletion windows/package-i686/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ RUN bash -l -c "pacman -Syuu --noconfirm --noprogressbar" && \
ARG GCC_DOWNLOAD_URL=https://github.com/niXman/mingw-builds-binaries/releases/download/12.2.0-rt_v10-rev0/i686-12.2.0-release-posix-sjlj-rt_v10-rev0.7z
RUN powershell -Command "Invoke-WebRequest -Uri %GCC_DOWNLOAD_URL% -OutFile C:\windows\temp\gcc.7z" && \
cd "C:\msys64" && \
C:\msys64\usr\lib\p7zip\7z.exe x "/c/windows/temp/gcc.7z"
bash -l -c "p7zip -d /c/windows/temp/gcc.7z" && \
bash -l -c "cp /mingw32/bin/gcc.exe /mingw32/bin/cc.exe"

# ---- Move to new container, to drop messy build history
ARG WIN_VERSION=ltsc2022
Expand Down

0 comments on commit ff8338e

Please sign in to comment.