squash and merge tags original branch not new target

[nmichlo]

Not sure if I am missing an obvious config setting, but squashing and merging, instead of a plain merge tags the original commit on the old branch from a PR rather than the new squashed and merged commit on our main branch.

[sbe-arg]

I think you are right

[nmichlo]

Thank you for your response.

Figured out the solution in the meantime. It's to change the ref for the second config in the readme to ${{ github.sha }} instead of the reference to the PR's head sha

Maybe a note can be added there for future users? Seems to be working fine now.

EDIT: this should actually be ${{ github.event.pull_request.merge_commit_sha }}, with the additional line if: github.event.pull_request.merged == true added too, please see below

[sbe-arg]

Updated example in this pr #218

[nmichlo]

Thank you! Although I have found an additional error:

...

name: version bump
on:
  pull_request:
    types:
      - closed
    branches:
      - main

jobs:
  build:
    if: github.event.pull_request.merged == true
    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v3
        with:
          ref: ${{ github.event.pull_request.merge_commit_sha }}
          fetch-depth: "0"

...

After looking at the GitHub docs, this is probably the correct reference to use for PR. ${{ github.event.pull_request.merge_commit_sha }} Not the original one I posted. (The original will probably work, but might be more error prone)

I also needed to add the if statement if: github.event.pull_request.merged == true which makes sure that the PR is actually merged, and not only closed (cancelled). Previously it was tagging the wrong branch too when it was not yet merged but just cancelled.

[sbe-arg]

Mind opening a pr with improved readme examples?

[nmichlo]

Sure thing @sbe-arg, I've opened the following PR:

• Fix README.md on merge into master from PR example #222