diff --git a/.github/workflows/release-sdk.yml b/.github/workflows/release-sdk.yml index 7b33f2271..655994320 100644 --- a/.github/workflows/release-sdk.yml +++ b/.github/workflows/release-sdk.yml @@ -399,7 +399,7 @@ jobs: pr_url="$(gh pr create \ --base main \ --head "${RELEASE_BRANCH}" \ - --title "chore(release): sdk-typescript ${RELEASE_TAG}" \ + --title "chore(release): sdk-typescript ${RELEASE_TAG} [skip ci]" \ --body "Automated release PR for sdk-typescript ${RELEASE_TAG}.")" fi @@ -411,9 +411,18 @@ jobs: env: GITHUB_TOKEN: '${{ secrets.CI_BOT_PAT }}' PR_URL: '${{ steps.pr.outputs.PR_URL }}' + RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}' run: |- set -euo pipefail - gh pr merge "${PR_URL}" --squash --auto --delete-branch + # Keep [skip ci] on the squash commit that lands on main. The release + # PR title also includes it for visibility, but --subject makes the + # post-merge CI-skip behavior explicit instead of depending on gh's + # default squash subject. + gh pr merge "${PR_URL}" \ + --squash \ + --auto \ + --delete-branch \ + --subject "chore(release): sdk-typescript ${RELEASE_TAG} [skip ci]" - name: 'Create Issue on Failure' if: |- diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1b784a8e..331d147d1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -435,7 +435,7 @@ jobs: pr_url="$(gh pr create \ --base main \ --head "${RELEASE_BRANCH}" \ - --title "chore(release): ${RELEASE_TAG}" \ + --title "chore(release): ${RELEASE_TAG} [skip ci]" \ --body "Automated release PR for ${RELEASE_TAG}. Syncs package.json versions on main.")" fi @@ -447,9 +447,18 @@ jobs: env: GITHUB_TOKEN: '${{ secrets.CI_BOT_PAT }}' PR_URL: '${{ steps.pr.outputs.PR_URL }}' + RELEASE_TAG: '${{ needs.prepare.outputs.release_tag }}' run: |- set -euo pipefail - gh pr merge "${PR_URL}" --squash --auto --delete-branch + # Keep [skip ci] on the squash commit that lands on main. The release + # PR title also includes it for visibility, but --subject makes the + # post-merge CI-skip behavior explicit instead of depending on gh's + # default squash subject. + gh pr merge "${PR_URL}" \ + --squash \ + --auto \ + --delete-branch \ + --subject "chore(release): ${RELEASE_TAG} [skip ci]" notify_failure: name: 'Notify Release Failure'