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.

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] Don't get local copies of remote branches we don't need #21441

Merged
merged 5 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/cherryPick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ jobs:
- name: Cherry-pick the version-bump to staging
run: |
# Find the commit for the version-bump
git fetch origin main
git switch main
VERSION_BUMP_COMMIT="$(git log --format='%H' --author='OSBotify' --grep 'Update version to ${{ env.NEW_VERSION }}')"

Expand Down
18 changes: 4 additions & 14 deletions .github/workflows/finishReleaseCycle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,10 @@ jobs:

- name: Update production branch
run: |
# Get the production branch locally
git switch production

# Delete the production branch and re-create it from staging
git switch staging
git branch -D production
# Re-create the production branch from staging
git switch -c production

# Force-update push the new production branch.
# Force-update the remote production branch.
git push --force origin production

- if: ${{ failure() }}
Expand Down Expand Up @@ -111,15 +106,10 @@ jobs:

- name: Update staging branch to trigger staging deploy
run: |
# Get the staging branch locally
git switch staging

# Delete the staging branch and re-create it from main
git switch main
git branch -D staging
# Re-create the staging branch from main
git switch -c staging

# Force-update the updated staging branch
# Force-update the remote staging branch
git push --force origin staging

- if: ${{ failure() }}
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/preDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,7 @@ jobs:
- name: Update staging branch from main
if: ${{ !fromJSON(needs.chooseDeployActions.outputs.SHOULD_CP) }}
run: |
# Get the staging branch locally
git switch staging

# Delete the staging branch and re-create it from main
git switch main
git branch -D staging
# Re-create the staging branch from main
git switch -c staging

# Force-update the remote staging branch
Expand Down