diff --git a/.github/workflows/briefcase.yml b/.github/workflows/briefcase.yml index f7b16b5..f4b9a09 100644 --- a/.github/workflows/briefcase.yml +++ b/.github/workflows/briefcase.yml @@ -22,6 +22,7 @@ jobs: id: get_commit_messages run: | git fetch --tags + echo "github.ref: ${{ github.ref }} if [ "${{ github.ref }}" = "refs/heads/prerelease" ]; then LAST_TAG=$(git ls-remote --tags --refs --sort="v:refname" | tail -n1 | sed 's/.*\///; s/\^{}//' 2>/dev/null || git rev-list --max-parents=0 HEAD) else diff --git a/push.sh b/push.sh index ccc558f..43c4fd7 100755 --- a/push.sh +++ b/push.sh @@ -18,5 +18,4 @@ git merge "$SOURCE_BRANCH" -m "merge $SOURCE_BRANCH into $DESTINATION_BRANCH" git push git checkout "$SOURCE_BRANCH" git pull origin "$SOURCE_BRANCH" -git merge "$DESTINATION_BRANCH" -m "merge $DESTINATION_BRANCH into $SOURCE_BRANCH" -git push +git merge "$DESTINATION_BRANCH" -m "merge $DESTINATION_BRANCH into $SOURCE_BRANCH"git push