From 6357ccae7823656d44385395a7bc4020e1f770b5 Mon Sep 17 00:00:00 2001 From: GilbN Date: Wed, 23 Mar 2022 21:23:58 +0100 Subject: [PATCH] workflow_dispatch options --- .github/workflows/docker-build.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 5c33d20f..737fb603 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -4,9 +4,19 @@ on: types: - released workflow_dispatch: + inputs: + branch: + description: 'Select branch' + required: true + type: choice + options: + - master + - develop push: branches: - develop + paths-ignore: + - '.github/**' jobs: push_to_ghcr_io: runs-on: ubuntu-latest @@ -28,12 +38,12 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GH_PAT }} - name: build&push master - if: ${{ github.event.release.target_commitish == 'master' }} + if: ${{ github.event.release.target_commitish == 'master' || github.event.inputs.branch == 'master' }} run: | docker build --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park --tag ghcr.io/gilbn/theme.park:${{ steps.get_version.outputs.VERSION }} . docker push --all-tags ghcr.io/gilbn/theme.park - name: build&push develop - if: ${{ github.ref == 'refs/heads/develop' }} + if: ${{ github.ref == 'refs/heads/develop' || github.event.inputs.branch == 'develop' }} run: | docker build --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag ghcr.io/gilbn/theme.park:develop . docker push --all-tags ghcr.io/gilbn/theme.park @@ -56,12 +66,12 @@ jobs: username: ${{ secrets.DH_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: build&push dh master - if: ${{ github.event.release.target_commitish == 'master' }} + if: ${{ github.event.release.target_commitish == 'master' || github.event.inputs.branch == 'master' }} run: | docker build --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag gilbn/theme.park --tag gilbn/theme.park:${{ steps.get_version.outputs.VERSION }} . docker push --all-tags gilbn/theme.park - name: build&push dh develop - if: ${{ github.ref == 'refs/heads/develop' }} + if: ${{ github.ref == 'refs/heads/develop' || github.event.inputs.branch == 'develop' }} run: | docker build --build-arg TP_RELEASE=${{ steps.get_version.outputs.VERSION }} --build-arg BUILD_DATE=${{ steps.date_time.outputs.NOW }} --tag gilbn/theme.park:develop . docker push --all-tags gilbn/theme.park