Skip to content

Commit 7cd3df8

Browse files
authored
FIX (DevOps) @W-15619530@ Fixing more typos in build processes. (#1471)
1 parent 83ef88d commit 7cd3df8

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/create-github-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ jobs:
3333
tag_name: v${{ steps.get-version-property.outputs.package_version }}
3434
name: v${{ steps.get-version-property.outputs.package_version }}
3535
body: See [release notes](https://developer.salesforce.com/docs/platform/salesforce-code-analyzer/guide/release-notes.html)
36-
token: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }}j
36+
token: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }}
3737
make_latest: true

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
needs: promote-to-latest
109109
runs-on: macos-latest
110110
env:
111-
GH_TOKEN: ${{ github.token }}
111+
GH_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }}
112112
permissions:
113113
contents: write
114114
pull-requests: write
@@ -131,13 +131,13 @@ jobs:
131131
It must be MERGED into dev, NOT SQUASHED OR REBASED. Squashing or rebasing this branch onto dev can cause potentially irreconcilable merge conflicts later.\n\
132132
As an additional safeguard and reminder, the title of this PR MUST include the word 'merging' in the description portion of the PR title, e.g., 'Main2Dev @W-XXXXXXX@ Merging main to dev after vX.Y.Z'.\n\
133133
If there are conflicts between dev and this branch, you should do the following locally:\n\
134-
- $ git checkout dev
135-
- $ git pull
136-
- $ git fetch --all
137-
- $ git checkout m2d/v$NEW_VERSION
138-
- $ git pull origin dev --no-rebase # You MUST include this flag, or someone's day will be ruined.
139-
- Resolve the merge conflicts manually. When in doubt, ask the code's author for help.
140-
- $ git commit
134+
- $ git checkout dev\n\
135+
- $ git pull\n\
136+
- $ git fetch --all\n\
137+
- $ git checkout m2d/v$NEW_VERSION\n\
138+
- $ git pull origin dev --no-rebase # You MUST include this flag, or someone's day will be ruined.\n\
139+
- Resolve the merge conflicts manually. When in doubt, ask the code's author for help.\n\
140+
- $ git commit\n\
141141
- $ git push" > body.txt
142142
# Create the pull request.
143143
gh pr create -B dev -H m2d/v$NEW_VERSION --title "Filler title. Read description and rename." -F body.txt

0 commit comments

Comments
 (0)