Skip to content

Commit 6a75e12

Browse files
committed
WIP: github: Test rerunning the docker build
1 parent 4a80285 commit 6a75e12

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

.github/workflows/docker.yml

Lines changed: 10 additions & 13 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:
@@ -29,8 +30,8 @@ jobs:
2930
with:
3031
workflow: build.yml
3132
workflow_conclusion: success
32-
commit: ${{inputs.commit}}
33-
branch: ${{inputs.branch}}
33+
commit:
34+
branch: master
3435
event: push
3536
name: parameters
3637
- name: Get build parameters
@@ -44,10 +45,8 @@ jobs:
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,7 +55,7 @@ jobs:
5655
uses: docker/build-push-action@v5
5756
with:
5857
context: .
59-
push: ${{inputs.push}}
58+
push: false
6059
file: ./Dockerfile.dev
6160
tags: |
6261
mstorsjo/llvm-mingw:dev
@@ -76,16 +75,14 @@ jobs:
7675
- { file: Dockerfile.toolchain, platforms: linux/arm64, key: arm64 }
7776
steps:
7877
- uses: actions/checkout@v4
79-
with:
80-
ref: ${{ (inputs.commit != '' && inputs.commit) || inputs.branch }}
8178
- name: Download toolchain
8279
if: ${{matrix.file == 'Dockerfile.toolchain'}}
8380
uses: dawidd6/action-download-artifact@v6
8481
with:
8582
workflow: build.yml
8683
workflow_conclusion: success
87-
commit: ${{inputs.commit}}
88-
branch: ${{inputs.branch}}
84+
commit:
85+
branch: master
8986
event: push
9087
name: linux-ucrt-.*
9188
name_is_regexp: true
@@ -96,7 +93,7 @@ jobs:
9693
- name: Set up Docker Buildx
9794
uses: docker/setup-buildx-action@v3
9895
- name: Log in to Docker Hub
99-
if: ${{inputs.login}}
96+
if: false
10097
uses: docker/login-action@v3
10198
with:
10299
username: ${{secrets.DOCKER_USERNAME}}
@@ -107,7 +104,7 @@ jobs:
107104
with:
108105
context: .
109106
platforms: ${{matrix.platforms}}
110-
push: ${{inputs.push}}
107+
push: false
111108
file: ./${{matrix.file}}
112109
outputs: |
113110
type=image,name=mstorsjo/llvm-mingw,push-by-digest=true,name-canonical=true
@@ -123,7 +120,7 @@ jobs:
123120
docker-create:
124121
needs: [docker-build, prepare]
125122
runs-on: ubuntu-latest
126-
if: ${{inputs.push}}
123+
if: false
127124
steps:
128125
- uses: cloudposse/github-action-matrix-outputs-read@main
129126
id: read

0 commit comments

Comments
 (0)