diff --git a/.github/actions/restore-node/action.yml b/.github/actions/restore-node/action.yml index 70c2200b501..066fb0339e8 100644 --- a/.github/actions/restore-node/action.yml +++ b/.github/actions/restore-node/action.yml @@ -76,6 +76,18 @@ runs: echo "sha=NOPE" >> $GITHUB_OUTPUT fi 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