Skip to content

Commit 549e2d7

Browse files
authored
Merge pull request #1487 from forcedotcom/m/W-15819273
FIX (DevOps) @W-15819273@ Fixing branch comparison for release.
2 parents 062176d + 9dc6488 commit 549e2d7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/publish-to-npm.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
verify-candidate-tag:
1616
runs-on: ubuntu-latest
1717
steps:
18-
# Check out the release branch, and get its head commit as output for later.
18+
# Check out the main branch, and get its head commit as output for later.
1919
- uses: actions/checkout@v4
2020
with:
21-
ref: 'release'
21+
ref: 'main'
2222
- run: echo "COMMIT_ID=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
2323
id: get-branch-commit
2424
# Checkout the tag we want to release, and get its head commit as output for later.
@@ -31,7 +31,7 @@ jobs:
3131
- name: Fail non-matching commits
3232
if: ${{ steps.get-branch-commit.outputs.COMMIT_ID != steps.get-tag-commit.outputs.COMMIT_ID }}
3333
run: |
34-
echo "Tag commit must match latest commit in release. Branch is ${{ steps.get-branch-commit.outputs.COMMIT_ID }}. Tag is ${{ steps.get-tag-commit.outputs.COMMIT_ID }}"
34+
echo "Tag commit must match latest commit in main. Branch is ${{ steps.get-branch-commit.outputs.COMMIT_ID }}. Tag is ${{ steps.get-tag-commit.outputs.COMMIT_ID }}"
3535
exit 1
3636
# Verify that the `package.json`'s version property is 4.Y.Z, as we want to restrict the `dev` and `release`
3737
# branches to publishing v4.x.

0 commit comments

Comments
 (0)