diff --git a/.github/workflows/create_branch_prefix.yml b/.github/workflows/create_branch_prefix.yml index 66d45a65a2..92c90e3cc7 100644 --- a/.github/workflows/create_branch_prefix.yml +++ b/.github/workflows/create_branch_prefix.yml @@ -41,7 +41,7 @@ jobs: shell: bash run: | VERSION="${{ inputs.version }}" - echo "branch-prefix=${{ inputs.prefix }}--$VERSION-" >> $GITHUB_OUTPUT + echo "branch-prefix=${{ inputs.prefix }}--$VERSION--" >> $GITHUB_OUTPUT echo "base-branch=${{ inputs.prefix }}--$VERSION" >> $GITHUB_OUTPUT - uses: ./.github/actions/configure_git diff --git a/.github/workflows/squash_branches.yml b/.github/workflows/squash_branches.yml index cd9a331023..4dbf27977b 100644 --- a/.github/workflows/squash_branches.yml +++ b/.github/workflows/squash_branches.yml @@ -71,6 +71,7 @@ jobs: CURRENT_BRANCH=$(git branch --show-current) for branch in ${{ steps.collect-branches.outputs.branches }}; do + echo "Merging $branch into $CURRENT_BRANCH" git merge --squash $branch done