Skip to content

Commit

Permalink
ci: merge integration branch before endo checkout (#8892)
Browse files Browse the repository at this point in the history
  • Loading branch information
mhofman authored Feb 12, 2024
1 parent cd8e0aa commit 7e8835e
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions .github/actions/restore-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,18 @@ runs:
}
console.log(branch);
return branch;
- name: merge endo integration branch
id: endo-integration-merge
run: |-
set -e
git ls-remote --exit-code --heads origin "refs/heads/integration-endo-${{ steps.endo-branch.outputs.result }}" || exit 0
git fetch --unshallow origin integration-endo-${{ steps.endo-branch.outputs.result }}
git config user.name github-actions
git config user.email github-actions@github.com
git merge --commit --no-edit origin/integration-endo-${{ steps.endo-branch.outputs.result }}
shell: bash
working-directory: ${{ inputs.path }}
if: steps.endo-branch.outputs.result != 'NOPE'
- name: check out Endo if necessary
id: endo-checkout
uses: actions/checkout@v3
Expand All @@ -84,18 +96,6 @@ runs:
echo "$sha" > endo-sha.txt
git add endo-sha.txt
shell: bash
- name: merge endo integration branch
id: endo-integration-merge
run: |-
set -e
git ls-remote --exit-code --heads origin "refs/heads/integration-endo-${{ steps.endo-branch.outputs.result }}" || exit 0
git fetch --unshallow origin integration-endo-${{ steps.endo-branch.outputs.result }}
git config user.name github-actions
git config user.email github-actions@github.com
git merge --commit --no-edit origin/integration-endo-${{ steps.endo-branch.outputs.result }}
shell: bash
working-directory: ${{ inputs.path }}
if: steps.endo-branch.outputs.result != 'NOPE'
- name: Reconfigure git to use HTTP authentication
run: git config --global url."https://github.com/".insteadOf ssh://git@github.com/
shell: bash
Expand Down

0 comments on commit 7e8835e

Please sign in to comment.