Merge branch 'main' into product-branch-1

opendatamesh-initiative · Dec 13, 2023 · 1b48fc8 · 1b48fc8
2 parents e05cdbc + bd2e22f
commit 1b48fc8
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -28,12 +28,10 @@ jobs:
           cache: maven
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
-      - name: Echo branch
-        run: echo "${{ github.event.base_ref }}"
       - name: Set env # Extract version and branch from tag and save them as environment variables
         run: |
           echo "TAG_VERSION=$( echo ${{github.ref_name}} | sed 's/[^0-9.]//g' )" >> $GITHUB_ENV
-          echo "BRANCH_NAME${{ github.event.base_ref }}" >> $GITHUB_ENV
+          echo "BRANCH_NAME=$( echo ${{ github.event.base_ref }} | sed 's|refs/heads/||' )" >> $GITHUB_ENV
       - name: Update versions
         run: mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${{ env.TAG_VERSION }}
       - name: Push new version