From 0d62c21e7d4c5236941630ea728f8beb5a03c963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 31 Jul 2023 10:48:30 +0300 Subject: [PATCH] Revert "WIP: github: Run the docker job on push too" This reverts commit ec9315a4f678b43fbc3828cdcebe1ff32002f8b4. --- .github/workflows/docker.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index df45a949..740e9be1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,6 +1,5 @@ name: Build docker images on: - push: workflow_dispatch: inputs: commit: @@ -25,7 +24,6 @@ jobs: TAG: ${{steps.get-parameters.outputs.TAG}} steps: - name: Download artifacts - if: github.event_name == 'workflow_dispatch' uses: dawidd6/action-download-artifact@v2 with: workflow: build.yml @@ -37,11 +35,7 @@ jobs: - name: Fetch build variables id: get-parameters run: | - if [ -f parameters.txt ]; then - cat parameters.txt >> $GITHUB_OUTPUT - else - echo TAG=test >> $GITHUB_OUTPUT - fi + cat parameters.txt >> $GITHUB_OUTPUT cat $GITHUB_OUTPUT docker-build: @@ -67,7 +61,7 @@ jobs: uses: docker/build-push-action@v4 with: context: . - push: ${{ (github.event_name == 'workflow_dispatch' && inputs.push) || false }} + push: ${{inputs.push}} file: ./${{matrix.file}} tags: | mstorsjo/llvm-mingw:${{matrix.maintag}}