Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build-tools/get-release-if-on-release-branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ fi

# Check if we are on a commit that is on a release branch but not on the main branch.
# (when checking out Splice as a submodule, we might be losing the branch information).
#
sha=$(git rev-parse HEAD)
if ! (git branch -r --contains "$sha" | grep -q "\borigin/main\b"); then
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So what is failing right now is that we check out commit edb2291be31694b9e55eba1ebb607c4eca1a1dbb which is also a commit on main, which then yields a fantasy version to deploy... all in all an artifact of switching repos and cutting 0.4.1 still on the old repo.

if [[ $(git branch -r --contains "$sha") =~ origin/release-line-[0-9]+\.[0-9]+\.[0-9]+ ]]; then
Expand Down
Loading