From dfe8f28ee4e7f69191bdc3a1433925abc532343b Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 18 Oct 2021 18:29:10 +0300 Subject: [PATCH] Fixed tag generation for releases --- .github/workflows/images_build.yml | 8 ++++---- .github/workflows/images_build_windows.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml index fed3d41d1..d34b01151 100644 --- a/.github/workflows/images_build.yml +++ b/.github/workflows/images_build.yml @@ -34,7 +34,7 @@ jobs: os: ${{ steps.os.outputs.list }} database: ${{ steps.database.outputs.list }} components: ${{ steps.components.outputs.list }} - is_default_branch: ${{ steps.branch_info.outputs.is_default }} + current_branch: ${{ steps.branch_info.outputs.current_branch }} steps: - name: Checkout repository uses: actions/checkout@v2.3.4 @@ -129,7 +129,7 @@ jobs: type=ref,event=branch,suffix=-${{ matrix.os }}-latest type=raw,enable=${{ needs.init_build.outputs.is_default_branch == 'true' }},value=${{matrix.os}}-latest flavor: | - latest=${{ (matrix.os == 'alpine') && (needs.init_build.outputs.is_default_branch == 'true') }} + latest=${{ (matrix.os == 'alpine') && (needs.init_build.outputs.current_branch == env.LATEST_BRANCH) }} - name: Build ${{ env.BASE_BUILD_NAME }}/${{ matrix.os }} and push id: docker_build @@ -202,7 +202,7 @@ jobs: type=ref,event=branch,suffix=-${{ matrix.os }}-latest type=raw,enable=${{ needs.init_build.outputs.is_default_branch == 'true' }},value=${{matrix.os}}-latest flavor: | - latest=${{ (matrix.os == 'alpine') && (needs.init_build.outputs.is_default_branch == 'true') }} + latest=${{ (matrix.os == 'alpine') && (needs.init_build.outputs.current_branch == env.LATEST_BRANCH) }} - name: Download SHA256 tag build-base:${{ matrix.os }} uses: actions/download-artifact@v2.0.10 @@ -301,7 +301,7 @@ jobs: type=ref,event=branch,suffix=-${{ matrix.os }}-latest type=raw,enable=${{ needs.init_build.outputs.is_default_branch == 'true' }},value=${{matrix.os}}-latest flavor: | - latest=${{ (matrix.os == 'alpine') && (needs.init_build.outputs.is_default_branch == 'true') }} + latest=${{ (matrix.os == 'alpine') && (needs.init_build.outputs.current_branch == env.LATEST_BRANCH) }} - name: Download SHA256 tag for ${{ steps.build_base_image.outputs.build_base }}:${{ matrix.os }} uses: actions/download-artifact@v2.0.10 diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml index 8c2e37e81..b3bfdb696 100644 --- a/.github/workflows/images_build_windows.yml +++ b/.github/workflows/images_build_windows.yml @@ -34,7 +34,7 @@ jobs: outputs: os: ${{ steps.os.outputs.list }} components: ${{ steps.components.outputs.list }} - is_default_branch: ${{ steps.branch_info.outputs.is_default }} + current_branch_branch: ${{ steps.branch_info.outputs.current_branch }} steps: - name: Checkout repository uses: actions/checkout@v2.3.4