fix: reinstate pull and do ff only

getAlby · Jun 14, 2024 · 6d5dc37 · 6d5dc37
1 parent 958f9f9
commit 6d5dc37
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.github/workflows/publish-bindings-go.yaml b/.github/workflows/publish-bindings-go.yaml
@@ -26,9 +26,11 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "github-actions"
           git config --global push.autoSetupRemote true
+          git config --global pull.ff only
           if [ "${{ env.LDK_BRANCH_NAME }}" != "main" ]; then
             git fetch
             git checkout -b ${{ env.TARGET_BRANCH_PREFIX }}${{ env.LDK_BRANCH_NAME }}
+            git pull origin ${{ env.TARGET_BRANCH_PREFIX }}${{ env.LDK_BRANCH_NAME }} || true
           fi
 
       - name: Download bindings