Skip to content

Commit c73af7e

Browse files
authored
fix(build): delete dups, fix tests (#14221)
1 parent 7005430 commit c73af7e

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

.github/scripts/docker_helpers.sh

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,20 @@ export SHORT_SHA=$(get_short_sha)
2020
echo "SHORT_SHA: $SHORT_SHA"
2121

2222
function get_tag {
23-
echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG},g" -e 's,refs/tags/,,g' -e 's,refs/heads/,,g' -e 's,refs/heads/,,g' -e 's,refs/pull/\([0-9]*\).*,pr\1,g' -e 's,/,-,g')
23+
echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG},g" -e 's,refs/tags/,,g' -e 's,refs/heads/,,g' -e 's,refs/pull/\([0-9]*\).*,pr\1,g' -e 's,/,-,g')
2424
}
2525

2626
function get_tag_slim {
27-
echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-slim,g" -e 's,refs/tags/\(.*\),\1-slim,g' -e 's,refs/heads/\(.*\),\1-slim,g' -e 's,refs/heads/\(.*\),\1-slim,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-slim,g' -e 's,/,-,g')
27+
echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-slim,g" -e 's,refs/tags/\(.*\),\1-slim,g' -e 's,refs/heads/\(.*\),\1-slim,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-slim,g' -e 's,/,-,g')
2828
}
2929

3030
function get_tag_full {
31-
echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-full,g" -e 's,refs/tags/\(.*\),\1-full,g' -e 's,refs/heads/\(.*\),\1-full,g' -e 's,refs/heads/\(.*\),\1-full,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-full,g' -e 's,/,-,g')
31+
echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-full,g" -e 's,refs/tags/\(.*\),\1-full,g' -e 's,refs/heads/\(.*\),\1-full,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-full,g' -e 's,/,-,g')
3232
}
3333

3434
function get_python_docker_release_v() {
3535
echo "$(echo "${REF}" | \
3636
sed -e "s,refs/heads/${MAIN_BRANCH},1\!0.0.0+docker.${SHORT_SHA},g" \
37-
-e 's,refs/heads/\(.*\),1!0.0.0+docker.\1,g' \
3837
-e 's,refs/heads/\(.*\),1!0.0.0+docker.\1,g' \
3938
-e 's,refs/tags/v\([0-9a-zA-Z.]*\).*,\1+docker,g' \
4039
-e 's,refs/pull/\([0-9]*\).*,1!0.0.0+docker.pr\1,g' \
@@ -50,21 +49,21 @@ if [ ${TEST_DOCKER_HELPERS:-0} -eq 1 ]; then
5049
REF="refs/heads/branch-name" get_python_docker_release_v # '1!0.0.0+docker.branch-name'
5150
REF="refs/heads/releases/branch-name" get_python_docker_release_v # 1!0.0.0+docker.releases-branch-name'
5251

53-
GITHUB_REF="refs/tags/v0.1.2rc1" get_tag # '0.1.2rc1'
54-
GITHUB_REF="refs/tags/v0.1.2rc1" get_tag_slim # '0.1.2rc1-slim'
55-
GITHUB_REF="refs/tags/v0.1.2rc1" get_tag_full # '0.1.2rc1-full'
52+
REF="refs/tags/v0.1.2rc1" get_tag # 'v0.1.2rc1'
53+
REF="refs/tags/v0.1.2rc1" get_tag_slim # 'v0.1.2rc1-slim'
54+
REF="refs/tags/v0.1.2rc1" get_tag_full # 'v0.1.2rc1-full'
5655

57-
GITHUB_REF="refs/pull/4788/merge" get_tag # 'pr4788'
58-
GITHUB_REF="refs/pull/4788/merge" get_tag_slim # 'pr4788-slim'
59-
GITHUB_REF="refs/pull/4788/merge" get_tag_full # 'pr4788-full'
56+
REF="refs/pull/4788/merge" get_tag # 'pr4788'
57+
REF="refs/pull/4788/merge" get_tag_slim # 'pr4788-slim'
58+
REF="refs/pull/4788/merge" get_tag_full # 'pr4788-full'
6059

61-
GITHUB_REF="refs/heads/branch-name" get_tag # 'branch-name'
62-
GITHUB_REF="refs/heads/branch-name" get_tag_slim # 'branch-name-slim'
63-
GITHUB_REF="refs/heads/branch-name" get_tag_full # 'branch-name-full'
60+
REF="refs/heads/branch-name" get_tag # 'branch-name'
61+
REF="refs/heads/branch-name" get_tag_slim # 'branch-name-slim'
62+
REF="refs/heads/branch-name" get_tag_full # 'branch-name-full'
6463

65-
GITHUB_REF="refs/heads/releases/branch-name" get_tag # 'releases-branch-name'
66-
GITHUB_REF="refs/heads/releases/branch-name" get_tag_slim # 'releases-branch-name-slim'
67-
GITHUB_REF="refs/heads/releases/branch-name" get_tag_full # 'releases-branch-name-full'
64+
REF="refs/heads/releases/branch-name" get_tag # 'releases-branch-name'
65+
REF="refs/heads/releases/branch-name" get_tag_slim # 'releases-branch-name-slim'
66+
REF="refs/heads/releases/branch-name" get_tag_full # 'releases-branch-name-full'
6867
fi
6968

7069
function get_unique_tag {

0 commit comments

Comments
 (0)