Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX (DevOps) @W-15619530@ Fixing more typos in build processes. #1471

Merged
merged 1 commit into from
May 20, 2024

Conversation

jfeingold35
Copy link
Collaborator

No description provided.

@@ -108,7 +108,7 @@ jobs:
needs: promote-to-latest
runs-on: macos-latest
env:
GH_TOKEN: ${{ github.token }}
GH_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty sure we actually wanted to be using the CLI Bot's PAT, so that the workflows about validating PRs will automatically kick off.

- $ git pull origin dev --no-rebase # You MUST include this flag, or someone's day will be ruined.
- Resolve the merge conflicts manually. When in doubt, ask the code's author for help.
- $ git commit
- $ git checkout dev\n\
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not positive that these missing newlines would have broken anything, but their presence definitely can't hurt.

@jfeingold35 jfeingold35 merged commit 7cd3df8 into dev May 20, 2024
13 checks passed
@jfeingold35 jfeingold35 deleted the d/W-15619530-v4-b branch May 20, 2024 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants