Code

Branch dance!#20791

Code

Merged

roryabraham merged 45 commits intomainExpensify/App:mainfrom

Rory-UseTheForceExpensify/App:Rory-UseTheForceCopy head branch name to clipboard

Jun 23, 2023

Commits

Commits on Jun 15, 2023

• Update protected branches without pull request

  roryabraham

  committed
  64369fb

  Copy full SHA for 64369fb

• Fix checkout in createNewVersion

  roryabraham

  committed
  3aa0723

  Copy full SHA for 3aa0723

• Dont use updateProtectedBranch from createNewVersion

  roryabraham

  committed
  4cb2058

  Copy full SHA for 4cb2058

• Dont use updateProtectedBranch from finishReleaseCycle

  roryabraham

  committed
  50f61b0

  Copy full SHA for 50f61b0

• Fix GPG password

  roryabraham

  committed
  e7d7730

  Copy full SHA for e7d7730

• Remove updateProtectedBranch from preDeploy

  roryabraham

  committed
  b0e9828

  Copy full SHA for b0e9828

• Remove updateProtectedBranch from finishReleaseCycle

  roryabraham

  committed
  7d1e4e6

  Copy full SHA for 7d1e4e6

• Remove unused updateProtectedBranch action

  roryabraham

  committed
  2ff4c95

  Copy full SHA for 2ff4c95

• Update documentation

  roryabraham

  committed
  8fa0fce

  Copy full SHA for 8fa0fce

• Simplify createNewVersion by lifting turnstyle up

  roryabraham

  committed
  49658ef

  Copy full SHA for 49658ef

• Update tests to accurate represent new logic

  roryabraham

  committed
  efc10d6

  Copy full SHA for efc10d6

• Cleanup tests a bit

  roryabraham

  committed
  983153d

  Copy full SHA for 983153d

• Update tests to passing state

  roryabraham

  committed
  9174a34

  Copy full SHA for 9174a34

• Simplify getPullRequestsMergedBetween implementation

  roryabraham

  committed
  2dcfaad

  Copy full SHA for 2dcfaad

• Use checkout v3

  roryabraham

  committed
  4294e5a

  Copy full SHA for 4294e5a

Commits on Jun 16, 2023

• Filter out any commits by OSBotify from the checklist

  roryabraham

  committed
  a16e4b9

  Copy full SHA for a16e4b9

• Eliminate CPd PRs from next checklist

  roryabraham

  committed
  7e7a37a

  Copy full SHA for 7e7a37a

• Rebuild GH Actions

  roryabraham

  committed
  8c6ec4e

  Copy full SHA for 8c6ec4e

• Remove dummy command

  roryabraham

  committed
  4b614ba

  Copy full SHA for 4b614ba

• Uncomment code

  roryabraham

  committed
  a7eab35

  Copy full SHA for a7eab35

• Fix GitUtilsTest

  roryabraham

  committed
  430bf2f

  Copy full SHA for 430bf2f

• Rebuild GH Actions

  roryabraham

  committed
  21248dc

  Copy full SHA for 21248dc

• Remove PR_COUNT variable that seems to be messing up bashhh

  roryabraham

  committed
  8b56f19

  Copy full SHA for 8b56f19

• Remove unnecessary setupNode

  roryabraham

  committed
  e42ea37

  Copy full SHA for e42ea37

• Secrets not inputs

  roryabraham

  committed
  246312a

  Copy full SHA for 246312a

• Add setupNode back for underscore

  roryabraham

  committed
  a6f4a46

  Copy full SHA for a6f4a46

• Create utility function for bumping version

  roryabraham

  committed
  6cb914b

  Copy full SHA for 6cb914b

• Create utility function for updating protected branch

  roryabraham

  committed
  0766dd6

  Copy full SHA for 0766dd6

• Create utility function for merge_pr

  roryabraham

  committed
  28282e6

  Copy full SHA for 28282e6

• Create utility function for cherry_pick_pr

  roryabraham

  committed
  1643553

  Copy full SHA for 1643553

• Create tag_staging utility function

  roryabraham

  committed
  a0b951f

  Copy full SHA for a0b951f

• Add tests for the wonky case

  roryabraham

  committed
  5b30665

  Copy full SHA for 5b30665

• Remove checkBundleVersionStringMatch

  roryabraham

  committed
  09fae72

  Copy full SHA for 09fae72

• Only create pull request for cherrypick if theres a conflict

  roryabraham

  committed
  7ee32c8

  Copy full SHA for 7ee32c8

• Remove unused isPullRequestMergeable actione

  roryabraham

  committed
  30826f0

  Copy full SHA for 30826f0

• Fix typo

  roryabraham

  committed
  e011630

  Copy full SHA for e011630

Commits on Jun 21, 2023

• Merge branch 'main' into Rory-UseTheForce

  roryabraham

  committed
  052291a

  Copy full SHA for 052291a

• Remove unnecessary safety check

  roryabraham

  committed
  7e82c8a

  Copy full SHA for 7e82c8a

• Update comments for branch dance

  roryabraham

  committed
  8a4ffcf

  Copy full SHA for 8a4ffcf

• Eliminate race condition in finishReleaseCycle

  roryabraham

  committed
  d84db7b

  Copy full SHA for d84db7b

• Merge branch 'main' into Rory-UseTheForce

  Show description for c3c7224
  roryabraham

  committed
  c3c7224

  Copy full SHA for c3c7224

• Add CONST for OSBotify

  roryabraham

  committed
  d6bb512

  Copy full SHA for d6bb512

• Fetch refs if needed from GitUtils so fetch-depth: 0 is not needed

  roryabraham

  committed
  2140760

  Copy full SHA for 2140760

• Add dependency for createNewStagingDeployCash

  roryabraham

  committed
  e680343

  Copy full SHA for e680343

• Update confusing comment

  roryabraham

  committed
  93b0bd5

  Copy full SHA for 93b0bd5