From 2ff3ba60acd794a0ecad9aed2154f568af8485df Mon Sep 17 00:00:00 2001 From: Ondrej Vlach Date: Sat, 25 Jan 2025 20:31:58 +0100 Subject: [PATCH] switch prefix/aditional_version --- .gitea/workflows/test.yaml | 1 + action.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 1037403..be92352 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + jobs: test: runs-on: ubuntu-latest diff --git a/action.yml b/action.yml index 98f6c0f..1f1e338 100644 --- a/action.yml +++ b/action.yml @@ -57,7 +57,7 @@ runs: shell: sh - name: Build additional args (version etc.) id: additional_args - run: echo "::set-output name=additional_args::$(if [[ "${{inputs.additional_version}}" != "" ]]; then echo "-t ${{ inputs.image_name }}:${{inputs.additional_version}}-${{inputs.docker_version_prefix}}"; else echo ""; fi)" + run: echo "::set-output name=additional_args::$(if [[ "${{inputs.additional_version}}" != "" ]]; then echo "-t ${{ inputs.image_name }}:${{inputs.docker_version_prefix}}-${{inputs.additional_version}}"; else echo ""; fi)" shell: sh - name: Build and push docker run: | @@ -67,7 +67,7 @@ runs: docker push ${{ inputs.image_name }}:${{inputs.docker_version_prefix}}-${{ steps.git.outputs.short_hash }} if [[ "${{inputs.additional_version}}" != "" ]]; then - docker push ${{ inputs.image_name }}:${{inputs.additional_version}}-${{inputs.docker_version_prefix}} + docker push ${{ inputs.image_name }}:${{inputs.docker_version_prefix}}-${{inputs.additional_version}} fi fi shell: sh