From 77c7a79ff786457711160834eaac6f5dcc624cf0 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Wed, 9 Oct 2024 13:24:23 -0400 Subject: [PATCH] rolling release: Add timestamp to version numbers (#39701) Apparently Atomic doesn't just pick the latest release, they also require that the new version number compares greater than the old one as measured by `version_compare()`. So we'll have to throw a timestamp in after all. --- .github/files/gh-autorelease/files/autorelease.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/files/gh-autorelease/files/autorelease.sh b/.github/files/gh-autorelease/files/autorelease.sh index 45e6a75475798..b4ac60309f027 100755 --- a/.github/files/gh-autorelease/files/autorelease.sh +++ b/.github/files/gh-autorelease/files/autorelease.sh @@ -28,7 +28,7 @@ elif [[ "$GITHUB_REF" == "refs/heads/trunk" ]]; then fi ROLLING_MODE=true CURRENT_VER=$( sed -nEe 's/^## \[?([^]]*)\]? - .*/\1/;T;p;q' CHANGELOG.md || true ) - GIT_SUFFIX=$( git log -1 --format=%h . ) + GIT_SUFFIX=$( git log -1 --format="%ct.g%h" . ) TAG="$CURRENT_VER+rolling.$GIT_SUFFIX" else echo "::error::Expected GITHUB_REF like \`refs/tags/v1.2.3\` or \`refs/tags/1.2.3\` or \`refs/heads/trunk\` for rolling releases, got \`$GITHUB_REF\`"