From 6af11fdb3b3a0cbd38dbaf19d4687f303993d66a Mon Sep 17 00:00:00 2001 From: Fran Arbanas Date: Tue, 5 Nov 2024 12:23:40 +0100 Subject: [PATCH] fix: remove unused part of code, add gateway probe git ref to tag name --- .github/workflows/push-node-status-agent.yaml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/push-node-status-agent.yaml b/.github/workflows/push-node-status-agent.yaml index 7461d6bc11..a31fef5673 100644 --- a/.github/workflows/push-node-status-agent.yaml +++ b/.github/workflows/push-node-status-agent.yaml @@ -36,23 +36,17 @@ jobs: with: cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml - - name: Check if tag exists - run: | - if git rev-parse ${{ steps.get_version.outputs.value }} >/dev/null 2>&1; then - echo "Tag ${{ steps.get_version.outputs.value }} already exists" - fi - - name: Remove existing tag if exists run: | - if git rev-parse ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} >/dev/null 2>&1; then - git push --delete origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} - git tag -d ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} + if git rev-parse ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ github.event.inputs.gateway_probe_git_ref }} >/dev/null 2>&1; then + git push --delete origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ github.event.inputs.gateway_probe_git_ref }} + git tag -d ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ github.event.inputs.gateway_probe_git_ref }} fi - name: Create tag run: | - git tag -a ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} -m "Version ${{ steps.get_version.outputs.result }}" - git push origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }} + git tag -a ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ github.event.inputs.gateway_probe_git_ref }} -m "Version ${{ steps.get_version.outputs.result }}-${{ github.event.inputs.gateway_probe_git_ref }}" + git push origin ${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}-${{ github.event.inputs.gateway_probe_git_ref }} - name: BuildAndPushImageOnHarbor run: |