Merge pull request #2497 from demergent-labs/fix_release_process_2477

Update prefix name to make it easier to match
demergent-labs · Jan 16, 2025 · 991761d · 991761d
2 parents 0d6eff5 + e9b38f8
commit 991761d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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