ci: ensure integration tests run to completion

Agoric · Aug 28, 2023 · 5623b3e · 5623b3e
1 parent d5a33e9
commit 5623b3e
Showing 1 changed file with 12 additions and 0 deletions.
diff --git 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 [email protected]
+        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://[email protected]/
       shell: bash