-
Notifications
You must be signed in to change notification settings - Fork 3k
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
[No QA] Pull latest code after waiting for turnstyle but before creating new branch #10660
Conversation
|
- name: Create new branch | ||
run: | | ||
BRANCH_NAME="version-${{ inputs.SEMVER_LEVEL }}-$(uuidgen)" | ||
git pull |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this line doing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I got confused and thought it was pulling $BRANCH_NAME
- But it's really pulling the branch from the checkout
step, right? Maybe it would be less confusing if this was the first line and $BRANCH_NAME
was defined under git pull
?
[No QA] Pull latest code after waiting for turnstyle but before creating new branch (cherry picked from commit dc066f1)
…-10660 🍒 Cherry pick PR #10660 to staging 🍒
🚀 Cherry-picked to staging by @AndrewGable in version: 1.1.93-5 🚀
|
🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀
|
Details
We had two workflows attempt to create the same version: https://expensify.slack.com/archives/C03V9A4TB/p1661786795302939?thread_ts=1661772196.825589&cid=C03V9A4TB
This PR will make it so that we wait for other
createNewVersion
workflows to finish before pulling the latest version and creating a new branch.Fixed Issues
$ n/a
Tests / QA Steps
Merge this PR. If the deploy works, then I think it's probably safe to assume this will work. We could attempt to CP two PRs in quick succession if you want a more robust validation of the fix.
PR Review Checklist
Contributor (PR Author) Checklist
### Fixed Issues
section aboveTests
sectionQA steps
sectiontoggleReport
and notonIconClick
)src/languages/*
filesSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)/** comment above it */
displayName
propertythis
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)PR Reviewer Checklist
The Contributor+ will copy/paste it into a new comment and complete it after the author checklist is completed
### Fixed Issues
section aboveTests
sectionQA steps
sectiontoggleReport
and notonIconClick
).src/languages/*
filesSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
have been tested & I retested again)/** comment above it */
displayName
propertythis
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)