Skip to content

Commit

Permalink
WIP: github: Test the Dockerfile.cross
Browse files Browse the repository at this point in the history
Run this with the non-dev version of the image, which is the
previous release, so we end up fetching a new version of llvm,
instead of reusing whatever was checked out in the dev image.
  • Loading branch information
mstorsjo committed Jun 19, 2024
1 parent 829a462 commit afc8e62
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Build docker images
on:
push:
workflow_dispatch:
inputs:
commit:
Expand All @@ -20,6 +21,7 @@ on:

jobs:
prepare:
if: false
runs-on: ubuntu-latest
outputs:
TAG: ${{steps.get-parameters.outputs.TAG}}
Expand All @@ -40,14 +42,11 @@ jobs:
cat $GITHUB_OUTPUT
docker-build-dev:
needs: [prepare]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ (inputs.commit != '' && inputs.commit) || inputs.branch }}
- name: Log in to Docker Hub
if: ${{inputs.login}}
if: false
uses: docker/login-action@v3
with:
username: ${{secrets.DOCKER_USERNAME}}
Expand All @@ -56,16 +55,16 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
push: ${{inputs.push}}
file: ./Dockerfile.dev
push: false
file: ./Dockerfile.cross
tags: |
mstorsjo/llvm-mingw:dev
mstorsjo/llvm-mingw:dev-${{needs.prepare.outputs.TAG}}
mstorsjo/llvm-mingw:cross
- name: Inspect Docker images
run: |
docker images
docker-build:
if: false
needs: [prepare]
runs-on: ubuntu-latest
strategy:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.cross
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# platform, but just copies over the runtime libraries from the existing
# toolchain in the base docker image.

ARG BASE=mstorsjo/llvm-mingw:dev
ARG BASE=mstorsjo/llvm-mingw
FROM $BASE

RUN apt-get update -qq && \
Expand Down

0 comments on commit afc8e62

Please sign in to comment.