Skip to content

Commit 8af46a2

Browse files
committed
WIP: github: Test the Dockerfile.cross
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.
1 parent 8704bae commit 8af46a2

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

.github/workflows/docker.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Build docker images
22
on:
3+
push:
34
workflow_dispatch:
45
inputs:
56
commit:
@@ -20,6 +21,7 @@ on:
2021

2122
jobs:
2223
prepare:
24+
if: false
2325
runs-on: ubuntu-latest
2426
outputs:
2527
TAG: ${{steps.get-parameters.outputs.TAG}}
@@ -40,14 +42,11 @@ jobs:
4042
cat $GITHUB_OUTPUT
4143
4244
docker-build-dev:
43-
needs: [prepare]
4445
runs-on: ubuntu-latest
4546
steps:
4647
- uses: actions/checkout@v4
47-
with:
48-
ref: ${{ (inputs.commit != '' && inputs.commit) || inputs.branch }}
4948
- name: Log in to Docker Hub
50-
if: ${{inputs.login}}
49+
if: false
5150
uses: docker/login-action@v3
5251
with:
5352
username: ${{secrets.DOCKER_USERNAME}}
@@ -56,16 +55,18 @@ jobs:
5655
uses: docker/build-push-action@v5
5756
with:
5857
context: .
59-
push: ${{inputs.push}}
60-
file: ./Dockerfile.dev
58+
push: false
59+
file: ./Dockerfile.cross
6160
tags: |
62-
mstorsjo/llvm-mingw:dev
63-
mstorsjo/llvm-mingw:dev-${{needs.prepare.outputs.TAG}}
61+
mstorsjo/llvm-mingw:cross
62+
build-args: |
63+
WITH_PYTHON=1
6464
- name: Inspect Docker images
6565
run: |
6666
docker images
6767
6868
docker-build:
69+
if: false
6970
needs: [prepare]
7071
runs-on: ubuntu-latest
7172
strategy:

Dockerfile.cross

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# platform, but just copies over the runtime libraries from the existing
99
# toolchain in the base docker image.
1010

11-
ARG BASE=mstorsjo/llvm-mingw:dev
11+
ARG BASE=mstorsjo/llvm-mingw
1212
FROM $BASE
1313

1414
RUN apt-get update -qq && \

0 commit comments

Comments
 (0)