File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 3434 fetch-depth : 0
3535 - name : find branch name
3636 shell : bash
37- run : echo "BRANCH_NAME=$(echo ${GITHUB_REF# refs/heads/} | tr / - )" >> $GITHUB_ENV
37+ 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
3838
3939 - name : setup docker buildx
4040 id : buildx
@@ -51,12 +51,12 @@ jobs:
5151 - name : show system environs
5252 if : github.event_name == 'push'
5353 run : ./ci/helpers/show_system_versions.bash
54- - if : contains(env.BRANCH_NAME, 'master')
54+ - if : contains(env.BRANCH_NAME, 'remotes/origin/ master')
5555 env :
5656 FROM_TAG_PREFIX : staging-github
5757 name : deploy
5858 run : ./ci/deploy/dockerhub-tag-version.bash
59- - if : contains(env.BRANCH_NAME, 'hotfix_v')
59+ - if : contains(env.BRANCH_NAME, 'remotes/origin/ hotfix_v')
6060 env :
6161 FROM_TAG_PREFIX : hotfix-github
6262 name : deploy from hotfix image
Original file line number Diff line number Diff line change 3333 fetch-depth : 0
3434 - name : find branch name
3535 shell : bash
36- run : echo "BRANCH_NAME=$(echo ${GITHUB_REF# refs/heads/} | tr / - )" >> $GITHUB_ENV
36+ 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
3737
3838 - name : setup docker buildx
3939 id : buildx
@@ -50,12 +50,12 @@ jobs:
5050 - name : show system environs
5151 if : github.event_name == 'push'
5252 run : ./ci/helpers/show_system_versions.bash
53- - if : contains(env.BRANCH_NAME, 'master')
53+ - if : contains(env.BRANCH_NAME, 'remotes/origin/ master')
5454 env :
5555 FROM_TAG_PREFIX : master-github
5656 name : deploy from master to staging
5757 run : ./ci/deploy/dockerhub-tag-version.bash
58- - if : contains(env.BRANCH_NAME, 'hotfix_staging_')
58+ - if : contains(env.BRANCH_NAME, 'remotes/origin/ hotfix_staging_')
5959 env :
6060 FROM_TAG_PREFIX : hotfix-staging-github
6161 name : deploy from hotfix staging to staging
You can’t perform that action at this time.
0 commit comments