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

Branch dance! #20791

Merged
merged 45 commits into from
Jun 23, 2023
Merged

Branch dance! #20791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
64369fb
Update protected branches without pull request
roryabraham Jun 15, 2023
3aa0723
Fix checkout in createNewVersion
roryabraham Jun 15, 2023
4cb2058
Dont use updateProtectedBranch from createNewVersion
roryabraham Jun 15, 2023
50f61b0
Dont use updateProtectedBranch from finishReleaseCycle
roryabraham Jun 15, 2023
e7d7730
Fix GPG password
roryabraham Jun 15, 2023
b0e9828
Remove updateProtectedBranch from preDeploy
roryabraham Jun 15, 2023
7d1e4e6
Remove updateProtectedBranch from finishReleaseCycle
roryabraham Jun 15, 2023
2ff4c95
Remove unused updateProtectedBranch action
roryabraham Jun 15, 2023
8fa0fce
Update documentation
roryabraham Jun 15, 2023
49658ef
Simplify createNewVersion by lifting turnstyle up
roryabraham Jun 15, 2023
efc10d6
Update tests to accurate represent new logic
roryabraham Jun 15, 2023
983153d
Cleanup tests a bit
roryabraham Jun 15, 2023
9174a34
Update tests to passing state
roryabraham Jun 15, 2023
2dcfaad
Simplify getPullRequestsMergedBetween implementation
roryabraham Jun 15, 2023
4294e5a
Use checkout v3
roryabraham Jun 15, 2023
a16e4b9
Filter out any commits by OSBotify from the checklist
roryabraham Jun 16, 2023
7e7a37a
Eliminate CPd PRs from next checklist
roryabraham Jun 16, 2023
8c6ec4e
Rebuild GH Actions
roryabraham Jun 16, 2023
4b614ba
Remove dummy command
roryabraham Jun 16, 2023
a7eab35
Uncomment code
roryabraham Jun 16, 2023
430bf2f
Fix GitUtilsTest
roryabraham Jun 16, 2023
21248dc
Rebuild GH Actions
roryabraham Jun 16, 2023
8b56f19
Remove PR_COUNT variable that seems to be messing up bashhh
roryabraham Jun 16, 2023
e42ea37
Remove unnecessary setupNode
roryabraham Jun 16, 2023
246312a
Secrets not inputs
roryabraham Jun 16, 2023
a6f4a46
Add setupNode back for underscore
roryabraham Jun 16, 2023
6cb914b
Create utility function for bumping version
roryabraham Jun 16, 2023
0766dd6
Create utility function for updating protected branch
roryabraham Jun 16, 2023
28282e6
Create utility function for merge_pr
roryabraham Jun 16, 2023
1643553
Create utility function for cherry_pick_pr
roryabraham Jun 16, 2023
a0b951f
Create tag_staging utility function
roryabraham Jun 16, 2023
5b30665
Add tests for the wonky case
roryabraham Jun 16, 2023
09fae72
Remove checkBundleVersionStringMatch
roryabraham Jun 16, 2023
7ee32c8
Only create pull request for cherrypick if theres a conflict
roryabraham Jun 16, 2023
30826f0
Remove unused isPullRequestMergeable actione
roryabraham Jun 16, 2023
e011630
Fix typo
roryabraham Jun 16, 2023
052291a
Merge branch 'main' into Rory-UseTheForce
roryabraham Jun 21, 2023
7e82c8a
Remove unnecessary safety check
roryabraham Jun 21, 2023
8a4ffcf
Update comments for branch dance
roryabraham Jun 21, 2023
d84db7b
Eliminate race condition in finishReleaseCycle
roryabraham Jun 21, 2023
c3c7224
Merge branch 'main' into Rory-UseTheForce
roryabraham Jun 21, 2023
d6bb512
Add CONST for OSBotify
roryabraham Jun 21, 2023
2140760
Fetch refs if needed from GitUtils so fetch-depth: 0 is not needed
roryabraham Jun 21, 2023
e680343
Add dependency for createNewStagingDeployCash
roryabraham Jun 21, 2023
93b0bd5
Update confusing comment
roryabraham Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 0 additions & 145 deletions .github/actions/composite/updateProtectedBranch/action.yml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .github/actions/javascript/checkBundleVersionStringMatch/action.yml
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions .github/actions/javascript/checkBundleVersionStringMatch/checkBundleVersionStringMatch.js
View file
Open in desktop

This file was deleted.

Loading