elgohr/Publish-Docker-Github-Action
2
0
Fork 0
mirror of https://github.com/elgohr/Publish-Docker-Github-Action.git synced 2026-03-12 18:07:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix semver regex to match multi digits minor version (#95)

Browse Source 
* Fix semver regex to match multi digits minor version

The new regex matches multi digits minor version such as v0.10.0.

Close https://github.com/elgohr/Publish-Docker-Github-Action/issues/94.

* Add test for multi digits semver
This commit is contained in:
Shouichi Kamiya
2020-06-26 03:39:13 +09:00
committed by GitHub
parent 2e38abd842
commit 780fbae7f4
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
entrypoint.sh
View File

@@ -91,7 +91,7 @@ translateDockerTag() {
elif isOnMaster; then elif isOnMaster; then
TAGS="latest" TAGS="latest"
elif isGitTag && usesBoolean "${INPUT_TAG_SEMVER}" && isSemver "${GITHUB_REF}"; then elif isGitTag && usesBoolean "${INPUT_TAG_SEMVER}" && isSemver "${GITHUB_REF}"; then
TAGS=$(echo "${GITHUB_REF}" | sed -e "s/refs\/tags\///g" | sed -E "s/v?([0-9]+)\.([0-9+])\.([0-9]+)(-[a-zA-Z]+(\.[0-9]+)?)?/\1.\2.\3\4 \1.\2\4 \1\4/g") TAGS=$(echo "${GITHUB_REF}" | sed -e "s/refs\/tags\///g" | sed -E "s/v?([0-9]+)\.([0-9]+)\.([0-9]+)(-[a-zA-Z]+(\.[0-9]+)?)?/\1.\2.\3\4 \1.\2\4 \1\4/g")
elif isGitTag && usesBoolean "${INPUT_TAG_NAMES}"; then elif isGitTag && usesBoolean "${INPUT_TAG_NAMES}"; then
TAGS=$(echo "${GITHUB_REF}" | sed -e "s/refs\/tags\///g") TAGS=$(echo "${GITHUB_REF}" | sed -e "s/refs\/tags\///g")
elif isGitTag; then elif isGitTag; then
@@ -149,7 +149,7 @@ usesBoolean() {
} }
isSemver() { isSemver() {
echo "${1}" | grep -Eq '^refs/tags/v?([0-9]+)\.([0-9+])\.([0-9]+)(-[a-zA-Z]+(\.[0-9]+)?)?$' echo "${1}" | grep -Eq '^refs/tags/v?([0-9]+)\.([0-9]+)\.([0-9]+)(-[a-zA-Z]+(\.[0-9]+)?)?$'
} }
useSnapshot() { useSnapshot() {

29
test.bats
View File

@@ -98,20 +98,37 @@ teardown() {
/usr/local/bin/docker push my/repository:latest" /usr/local/bin/docker push my/repository:latest"
} }
@test "with tag semver it pushes tags using the major and minor versions" { @test "with tag semver it pushes tags using the major and minor versions (single digit)" {
export GITHUB_REF='refs/tags/v1.2.34' export GITHUB_REF='refs/tags/v1.2.3'
export INPUT_TAG_SEMVER="true" export INPUT_TAG_SEMVER="true"
run /entrypoint.sh run /entrypoint.sh
expectStdOutContains "::set-output name=tag::1.2.34" expectStdOutContains "::set-output name=tag::1.2.3"
expectMockCalled "/usr/local/bin/docker login -u USERNAME --password-stdin expectMockCalled "/usr/local/bin/docker login -u USERNAME --password-stdin
/usr/local/bin/docker build -t my/repository:1.2.34 -t my/repository:1.2 -t my/repository:1 . /usr/local/bin/docker build -t my/repository:1.2.3 -t my/repository:1.2 -t my/repository:1 .
/usr/local/bin/docker push my/repository:1.2.34 /usr/local/bin/docker push my/repository:1.2.3
/usr/local/bin/docker push my/repository:1.2 /usr/local/bin/docker push my/repository:1.2
/usr/local/bin/docker push my/repository:1 /usr/local/bin/docker push my/repository:1
/usr/local/bin/docker inspect --format={{index .RepoDigests 0}} my/repository:1.2.34 /usr/local/bin/docker inspect --format={{index .RepoDigests 0}} my/repository:1.2.3
/usr/local/bin/docker logout"
}
@test "with tag semver it pushes tags using the major and minor versions (multi digits)" {
export GITHUB_REF='refs/tags/v12.345.5678'
export INPUT_TAG_SEMVER="true"
run /entrypoint.sh
expectStdOutContains "::set-output name=tag::12.345.5678"
expectMockCalled "/usr/local/bin/docker login -u USERNAME --password-stdin
/usr/local/bin/docker build -t my/repository:12.345.5678 -t my/repository:12.345 -t my/repository:12 .
/usr/local/bin/docker push my/repository:12.345.5678
/usr/local/bin/docker push my/repository:12.345
/usr/local/bin/docker push my/repository:12
/usr/local/bin/docker inspect --format={{index .RepoDigests 0}} my/repository:12.345.5678
/usr/local/bin/docker logout" /usr/local/bin/docker logout"
} }