Skip to content

[No QA] Make sure target and source branches are up-to-date #9849

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

Merged
roryabraham merged 3 commits into from
Jul 12, 2022
Merged

[No QA] Make sure target and source branches are up-to-date #9849

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
458efbc
Make sure target and source branches are up-to-date
roryabraham Jul 12, 2022
f80de79
Eliminate unnecessary network requests
roryabraham Jul 12, 2022
7ceed5b
Remove unnecessary --all
roryabraham Jul 12, 2022
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
5 changes: 4 additions & 1 deletion .github/actions/composite/updateProtectedBranch/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,14 @@ runs:
with:
GPG_PASSPHRASE: ${{ inputs.GPG_PASSPHRASE }}

- name: Checkout source branch
- name: Update target and source branches
shell: bash
run: |
git fetch
git checkout ${{ env.TARGET_BRANCH }}
git merge origin/${{ env.TARGET_BRANCH }}
git checkout ${{ env.SOURCE_BRANCH }}
git merge origin/${{ env.SOURCE_BRANCH }}

- name: Set New Version
shell: bash
Expand Down