Merged
Conversation
# Conflicts: # .github/workflows/deployBlocker.yml # .github/workflows/platformDeploy.yml
# Conflicts: # .github/workflows/deployBlocker.yml # tests/unit/CIGitLogicTest.sh
Contributor
Author
|
No C+ review needed here |
mountiny
previously approved these changes
Nov 20, 2023
Contributor
mountiny
left a comment
There was a problem hiding this comment.
Thanks @roryabraham for digging into this one, this is last thing holding the deploy, the changes make sense to me and automated tests have been added, I will go ahead and merge this to get the deploy going sooner than later.
| jobs: | ||
| updateChecklist: | ||
| if: github.event.label.name == 'DeployBlockerCash' | ||
| uses: ./.github/workflows/createDeployChecklist.yml |
Contributor
There was a problem hiding this comment.
I think it would be cleaner to call this create or update too
Suggested change
| uses: ./.github/workflows/createDeployChecklist.yml | |
| uses: ./.github/workflows/createOrUpdateDeployChecklist.yml |
Contributor
|
Had to resolve merge conflicts |
90 tasks
Contributor
|
🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.1-13 🚀
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Details
This PR should hopefully fix #27123, but includes a few changes:
--shallow-excludefor both thefromTagand thetoTag(see testing details for why I think this change will fix the issue).createDeployChecklist.yml. That way, we can re-create or refresh the checklist whenever we want.createOrUpdateStagingDeployJS action by removing theNPM_VERSIONinput. It always just needs to compare the most recent version to the previous version on the checklist (previous checklist in the case of a production deploy / new checklist, current checklist in the case of updating an existing checklist)CIGitLogicTest.shand adds a new test case w/ rebase + force-push.Fixed Issues
$ #27123
Tests
Slack context: https://expensify.slack.com/archives/C07J32337/p1700246543029419
The background here is bad workflow runs that cause deploy checklists to include PRs from the previous checklist. For example this one. In that example, #31066 was originally cherry-picked in
1.3.96-15. So it should not appear in this log:git log --oneline --grep "Merge pull request #" 1.3.97-7...1.3.98-0But in the workflow run, it does. In order to reproduce the problem locally, do the following:
Now, if you run the following:
Offline tests
None.
QA Steps
None – monitor checklist creation and verify that they no longer contain old PRs.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)myBool && <MyComponent />.src/languages/*files and using the translation methodWaiting for Copylabel for a copy review on the original GH to get the correct copy.STYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop