Skip to content

Commit 17371e2

Browse files
authored
fix: prerelease generated version strings that could not be compared (#72)
fix an issue where functions like PHP's `version_compare` would incorrectly compare a PR build to a pre-existing published version. we now always append the number of "commits since tag" number so that any build is more likely to be able to be correctly compared and return a greater version number than actual older versions fixes INT-876
1 parent d595c1e commit 17371e2

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

pdk-prerelease/action.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,32 +84,23 @@ runs:
8484
#language=bash
8585
run: |
8686
version=$(npm pkg get version | sed 's/"//g')
87-
isPreRelease=$(echo "$version" | grep -E -- '-[a-z]+\.[0-9]+$' || true)
87+
commitsSinceTag=$(git log --oneline "v$version.." | wc -l)
88+
89+
releaseVersion="$version-$commitsSinceTag"
8890
8991
if [ "$MODE" == "pull_request" ]; then
9092
branch=$(echo $GITHUB_HEAD_REF | sed -e 's/\//-/g')
91-
releaseVersion="dev-$PR_NUMBER-$branch"
93+
releaseVersion="$releaseVersion-$PR_NUMBER-$branch"
9294
9395
if [ "$DEBUG" == "1" ]; then
9496
echo "branch=$branch"
9597
fi
96-
else
97-
commitsSinceTag=$(git log --oneline "v$version.." | wc -l)
98-
99-
if [ -n "$isPreRelease" ]; then
100-
releaseVersion="$version-$commitsSinceTag"
101-
else
102-
releaseVersion="$version-rc.$commitsSinceTag"
103-
fi
104-
105-
if [ "$DEBUG" == "1" ]; then
106-
echo "commitsSinceTag=$commitsSinceTag"
107-
fi
10898
fi
10999
110100
if [ $DEBUG == "1" ]; then
111101
echo "MODE=$MODE"
112102
echo "PR_NUMBER=$PR_NUMBER"
103+
echo "commitsSinceTag=$commitsSinceTag"
113104
echo "isPreRelease=$isPreRelease"
114105
echo "releaseVersion=$releaseVersion"
115106
echo "version=$version"

0 commit comments

Comments
 (0)