suggested adjustments

Signed-off-by: Michael Zeevi <[email protected]>

Author: maze88

.github/workflows/ci.yaml

@@ -91,21 +91,9 @@ jobs:
     - uses: actions/checkout@v4
       with:
         token: ${{ secrets.GH_TOKEN_NVIDIA_CI_CD }}  # token must be explicitly set here for push to work in following step
-    - name: Set is_push flag
-      id: set-is-push
+    - name: Determine version, tag, and base branch
       run: |
-        if [[ "${{ github.event_name }}" == "push" && "${{ github.ref_type }}" == "tag" ]]; then
-          echo "is_push=false" >> $GITHUB_ENV
-        else
-          echo "is_push=true" >> $GITHUB_ENV
-        fi
-    - name: Determine version, tag, and base branch - Process based on is_push flag
-      run: |
-        if [[ "$is_push" == "true" ]]; then
-          echo "Setting VERSION_WITH_PREFIX to git commit hash."
-          VERSION_WITH_PREFIX=$(git rev-parse --short HEAD)
-          echo VERSION_WITH_PREFIX=$VERSION_WITH_PREFIX >> $GITHUB_ENV
-        else
+        if [[ "${{ github.ref_type }}" == "tag" ]]; then
           git_tag=${{ github.ref_name }}
           echo VERSION_WITH_PREFIX=$git_tag >> $GITHUB_ENV
           echo VERSION_WITHOUT_PREFIX=${git_tag:1} >> $GITHUB_ENV  # without the 'v' prefix
@@ -116,6 +104,8 @@ jobs:
             base_branch=$v_major_minor.x
           fi
           echo BASE_BRANCH=$base_branch >> $GITHUB_ENV
+        elif [[ "${{ github.ref_type }}" == "branch" && "${{ github.event_name }}" == "push" ]]; then
+          echo VERSION_WITH_PREFIX=$(git rev-parse --short HEAD) >> $GITHUB_ENV
         fi
     - uses: docker/login-action@v3
       with:
@@ -139,23 +129,22 @@ jobs:
         BUNDLE_IMG: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-bundle:${{ env.VERSION_WITH_PREFIX }}
         NGC_CLI_API_KEY: ${{ secrets.NVCR_TOKEN }}
       run: |
-        if [[ "$is_push" == "false" ]]; then
-          export VERSION=${{ env.VERSION_WITHOUT_PREFIX }}
+        if [[ "${{ github.ref_type }}" == "tag" ]]; then
           version_major_minor=$(echo $VERSION_WITH_PREFIX | grep -Eo 'v[0-9]+\.[0-9]+')
           export CHANNELS=stable,$version_major_minor
           export DEFAULT_CHANNEL=$version_major_minor
-        else
-          export DEFAULT_CHANNEL=v1.1 # hard coded
-          export CHANNELS=stable,v1.1 # hard coded
+          export VERSION=${{ env.VERSION_WITHOUT_PREFIX }}
+        elif [[ "${{ github.ref_type }}" == "branch" && "${{ github.event_name }}" == "push" ]]; then
+          export CHANNELS=stable,v1.1  # hard coded
+          export DEFAULT_CHANNEL=v1.1  # hard coded
           export VERSION=1.1.0-${{ env.VERSION_WITH_PREFIX }}  # using the commit hash
           export NETWORK_OPERATOR_VERSION=${{ env.VERSION_WITH_PREFIX }} # for push use commit sha
         fi
         make bundle bundle-build bundle-push
-        if [[ "$is_push" == "true" ]]; then
+        if [[ "${{ github.ref_type }}" == "branch" && "${{ github.event_name }}" == "push" ]]; then
           export BUNDLE_IMG=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-bundle:latest  # hard coded
           make bundle-build bundle-push
         fi
-
     - name: Create PR with bundle to Network Operator
       if: github.ref_type == 'tag'
       env: