properly get branch name (#2970)

ITISFoundation · Apr 7, 2022 · b6fa6c2 · b6fa6c2
1 parent 5c09b8f
commit b6fa6c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -34,7 +34,7 @@ jobs:
           fetch-depth: 0
       - name: find branch name
         shell: bash
-        run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
+        run: echo "BRANCH_NAME=$(git name-rev --refs="refs/remotes/origin/master" --refs="refs/remotes/origin/hotfix_v*" --refs="refs/remotes/origin/hotfix_staging_*" --name-only ${GITHUB_SHA})" >> $GITHUB_ENV
 
       - name: setup docker buildx
         id: buildx
@@ -51,12 +51,12 @@ jobs:
       - name: show system environs
         if: github.event_name == 'push'
         run: ./ci/helpers/show_system_versions.bash
-      - if: contains(env.BRANCH_NAME, 'master')
+      - if: contains(env.BRANCH_NAME, 'remotes/origin/master')
         env:
           FROM_TAG_PREFIX: staging-github
         name: deploy
         run: ./ci/deploy/dockerhub-tag-version.bash
-      - if: contains(env.BRANCH_NAME, 'hotfix_v')
+      - if: contains(env.BRANCH_NAME, 'remotes/origin/hotfix_v')
         env:
           FROM_TAG_PREFIX: hotfix-github
         name: deploy from hotfix image

diff --git a/.github/workflows/ci-staging.yml b/.github/workflows/ci-staging.yml
@@ -33,7 +33,7 @@ jobs:
           fetch-depth: 0
       - name: find branch name
         shell: bash
-        run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
+        run: echo "BRANCH_NAME=$(git name-rev --refs="refs/remotes/origin/master" --refs="refs/remotes/origin/hotfix_v*" --refs="refs/remotes/origin/hotfix_staging_*" --name-only ${GITHUB_SHA})" >> $GITHUB_ENV
 
       - name: setup docker buildx
         id: buildx
@@ -50,12 +50,12 @@ jobs:
       - name: show system environs
         if: github.event_name == 'push'
         run: ./ci/helpers/show_system_versions.bash
-      - if: contains(env.BRANCH_NAME, 'master')
+      - if: contains(env.BRANCH_NAME, 'remotes/origin/master')
         env:
           FROM_TAG_PREFIX: master-github
         name: deploy from master to staging
         run: ./ci/deploy/dockerhub-tag-version.bash
-      - if: contains(env.BRANCH_NAME, 'hotfix_staging_')
+      - if: contains(env.BRANCH_NAME, 'remotes/origin/hotfix_staging_')
         env:
           FROM_TAG_PREFIX: hotfix-staging-github
         name: deploy from hotfix staging to staging