Skip to content

Commit

Permalink
fix: Release workflow ⚓
Browse files Browse the repository at this point in the history
  • Loading branch information
gabyx committed Apr 21, 2024
1 parent ee2b532 commit a4c50bd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,35 @@ jobs:
RELEASE_BRANCH="main"
RELEASE_VERSION="${RELEASE_TAG##v}"
regex="^Release-Branch:\s+(.*)$"
echo "Get release branch on tag '$RELEASE_TAG'."
# Gets the message on the annotated commit:
deref() {
git for-each-ref "refs/tags/$RELEASE_TAG" --format="%($1)" ;
};
git show -s --format="" $RELEASE_TAG
deref contents
regex="^Release-Branch:\s+(.*)$"
if deref contents | grep -qE "$regex"; then
RELEASE_BRANCH=$(deref contents | grep -E "$regex" |
sed -E "s/$regex/\1/") || {
echo "Release-Branch trailer is wrong."
exit 1
}
[ -n "$RELEASE_BRANCH" ] || {
echo "Release-Branch trailer is empty."
exit 1
}
fi
# Fetch the branch.
git fetch --depth 50 origin "$RELEASE_BRANCH"
# Check if its reachable.
[ -n "$(git rev-list --first-parent \
--ancestry-path
--ancestry-path \
"$RELEASE_TAG^..origin/$RELEASE_BRANCH")" ] || {
echo "Tag is not reachable from '$RELEASE_BRANCH' (--first-parent) !" >&2
exit 1
Expand Down
4 changes: 3 additions & 1 deletion nix/pkgs/version.json
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{ "version": "3.0.0" }
{
"version": "3.0.0-rc1"
}
2 changes: 1 addition & 1 deletion scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function commit_version_file() {
jq ".version |= \"$version\"" nix/pkgs/version.json >"$temp"
mv "$temp" nix/pkgs/version.json

if git diff --quiet --exit-code; then
if ! git diff --quiet --exit-code; then
git add nix/pkgs/version.json
git commit -m "np: Update version to '$version'"
fi
Expand Down

0 comments on commit a4c50bd

Please sign in to comment.