From 9efab561fa0bfcfd0b2f9f5c2e24459064e8113e Mon Sep 17 00:00:00 2001 From: Michael Gardner Date: Thu, 19 Oct 2023 13:18:04 -0400 Subject: [PATCH] HPCC-30575 Fix versioning for golds and new jf docker push syntax Signed-off-by: Michael Gardner --- .github/workflows/build-assets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml index 395df3ec30e..510fb15c55b 100644 --- a/.github/workflows/build-assets.yml +++ b/.github/workflows/build-assets.yml @@ -55,7 +55,7 @@ jobs: community_tag=$(echo $community_ref | cut -d'/' -f3) echo "community_tag=$community_tag" >> $GITHUB_OUTPUT echo "internal_tag=$(echo $community_tag | sed 's/community/internal/')" >> $GITHUB_OUTPUT - echo "hpcc_version=$(echo $community_tag | sed 's/community_//')" >> $GITHUB_OUTPUT + echo "hpcc_version=$(echo $community_tag | sed 's/community_//' | sed 's/-[0-9]$//')" >> $GITHUB_OUTPUT community_base_ref=${{ github.event.base_ref || github.ref }} candidate_branch=$(echo $community_base_ref | cut -d'/' -f3) echo "candidate_branch=$candidate_branch" >> $GITHUB_OUTPUT @@ -347,7 +347,7 @@ jobs: - name: JFrog Docker Push and Publish if: ${{ matrix.ln && matrix.container && !matrix.documentation && github.repository_owner == 'hpcc-systems' }} run: | - jf rt dp ${{ secrets.JFROG_REGISTRY || 'dummy.io' }}/hpccpl-docker-local/hpcc-platform/${{ matrix.os }}/platform-core-ln:${{ needs.preamble.outputs.hpcc_version }} hpccpl-docker-local --build-name=platform-core-ln --build-number=${{ needs.preamble.outputs.hpcc_version }} --project=hpccpl + jf docker push ${{ secrets.JFROG_REGISTRY || 'dummy.io' }}/hpccpl-docker-local/hpcc-platform/${{ matrix.os }}/platform-core-ln:${{ needs.preamble.outputs.hpcc_version }} --build-name=platform-core-ln --build-number=${{ needs.preamble.outputs.hpcc_version }} --project=hpccpl jf rt bp platform-core-ln ${{ needs.preamble.outputs.hpcc_version }} --project=hpccpl # Common ---