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.

Sign up for GitHub

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

Jump to bottom

[No QA] Update staging from main #4113

Merged
merged 471 commits into from
Jul 16, 2021
Merged

[No QA] Update staging from main #4113

merged 471 commits into from
Jul 16, 2021

Conversation

roryabraham
Copy link
Contributor

cc @tgolen

Details

Come from this comment

Fixed Issues

$ #4060

Tests

  1. Merge this PR. I don't expect a staging deploy to occur.
  2. Unlock and relock the StagingDeployCash.
  3. A staging deploy should occur.
  4. Hopefully nothing breaks, because this is something outside the normal flow. 🙃

QA Steps

No QA.

Tested On

n/a – GitHub only.

@OSBotify
Merge pull request #3044 from Expensify/main
31ce522
@OSBotify
Merge pull request #3054 from Expensify/main
f47d2b3
@OSBotify
Merge pull request #3057 from Expensify/main
9b0a3ee
@OSBotify
Merge pull request #3063 from Expensify/main
45e2796
@OSBotify
Merge pull request #3065 from Expensify/main
da29100
@OSBotify
Merge pull request #3075 from Expensify/main
efc9c74
@OSBotify
Merge pull request #3082 from Expensify/main
378add3
@OSBotify
Merge pull request #3084 from Expensify/main
bbbe1d4
@OSBotify
Merge pull request #3086 from Expensify/main
7267ab8
@OSBotify
Merge pull request #3089 from Expensify/main
f4b6f77
@OSBotify
Merge pull request #3091 from Expensify/main
e83c1e8
@OSBotify
Merge pull request #3098 from Expensify/main
03fd054
@OSBotify
Merge pull request #3116 from Expensify/main
18718ef
@OSBotify
Merge pull request #3118 from Expensify/main
f311fc1
@OSBotify
Merge pull request #3120 from Expensify/main
dfa1548
@OSBotify
Merge pull request #3122 from Expensify/main
bf31884
@OSBotify
Merge pull request #3126 from Expensify/main
a5f9d38
@OSBotify
Merge pull request #3132 from Expensify/main
ebaf800
@OSBotify
Merge pull request #3142 from Expensify/main
41dc9cc
@OSBotify
Merge pull request #3146 from Expensify/main
3577353
@OSBotify
Merge pull request #3148 from Expensify/main
20e6c0b
@OSBotify
Merge pull request #3155 from Expensify/main
b07a1a6
@OSBotify
Merge pull request #3159 from Expensify/main
23c56a3
@OSBotify
Merge pull request #3161 from Expensify/main
b04131e
@OSBotify
Merge pull request #3163 from Expensify/main
da26a54
@OSBotify
Merge pull request #3165 from Expensify/main
5dbcfe8
@OSBotify
Merge pull request #3177 from Expensify/main
44f4bce
@OSBotify
Merge pull request #3180 from Expensify/main
8d0ec69
@OSBotify
Merge pull request #3182 from Expensify/main
aa7b079
@OSBotify
Merge pull request #3185 from Expensify/main
968596c
OSBotify and others added 14 commits July 15, 2021 02:40
@OSBotify
Merge pull request #4064 from Expensify/version-BUILD-951308fb3319f64…
bb6e612 
…c10b3302f904b26b65d72801e

(cherry picked from commit 1a1d66a)
@marcaaron
Merge pull request #4059 from Expensify/joe-report-action-count
4d59949 
[CP Staging] Don't show all chats in LHN in #focus mode

(cherry picked from commit 951308f)
@OSBotify
Merge pull request #4065 from Expensify/cherry-pick-staging-4059
a4d0417
@OSBotify
Merge pull request #4087 from Expensify/version-BUILD-d15c65a3095fe16…
18e7ea3 
…6e458181ed9e14d3b0adc4e56

(cherry picked from commit b6d2c0d)
@chiragsalian
Merge pull request #4085 from Expensify/chirag-revert-3979
c2f92b6 
Reverting 3979

(cherry picked from commit d15c65a)
@OSBotify
Merge pull request #4088 from Expensify/cherry-pick-staging-4085
6eb655d
Merge branch 'main' into update-staging-from-main
54b1165
@OSBotify
Merge pull request #4093 from Expensify/update-staging-from-main
47395d2
Merge branch 'main' into update-staging-from-main
7ebb237
@OSBotify
Merge pull request #4095 from Expensify/update-staging-from-main
7562574
Merge branch 'main' into update-staging-from-main
604c4a2
@OSBotify
Merge pull request #4100 from Expensify/update-staging-from-main
37563e5
Merge branch 'main' into update-staging-from-main
933a42d
@OSBotify
Merge pull request #4103 from Expensify/update-staging-from-main
ee15adb
@roryabraham roryabraham self-assigned this Jul 16, 2021
@roryabraham roryabraham requested a review from a team as a code owner July 16, 2021 15:09
@MelvinBot MelvinBot requested review from tgolen and removed request for a team July 16, 2021 15:09
@roryabraham roryabraham mentioned this pull request Jul 16, 2021
Closed
tgolen
tgolen approved these changes Jul 16, 2021
View reviewed changes
Copy link
Contributor

@tgolen tgolen left a comment

Choose a reason for hiding this comment

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

OK, let's do it.

@roryabraham roryabraham merged commit bb02d77 into main Jul 16, 2021
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@roryabraham
Copy link
Contributor Author

As expected, no staging deploy occurred. The above comment is not 100% accurate, but we don't need to worry about that right now.

@roryabraham
Copy link
Contributor Author

Oof, I think this was backwards 🤦

@roryabraham
Copy link
Contributor Author

We merged staging into main, not the other way around. That was not what I meant to do... 😓

@roryabraham
Copy link
Contributor Author

Sorry for the inconvenience @tgolen, but I think now the best thing to do is to create a normal PR to fix the issue on main and then CP it to staging.

@OSBotify OSBotify mentioned this pull request Jul 16, 2021
Closed
95 tasks
@OSBotify OSBotify mentioned this pull request Jul 23, 2021
Closed
60 tasks
@OSBotify
Copy link
Contributor

🚀 Deployed to staging in version: 1.0.79-5🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@OSBotify
Copy link
Contributor

🚀 Deployed to production in version: 1.0.80-2🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tgolen tgolen tgolen approved these changes

Assignees

@roryabraham roryabraham

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.