!drop

LedgerHQ · Apr 2, 2024 · 01b339b · 01b339b
1 parent d5dc647
commit 01b339b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/generate-screenshots.yml b/.github/workflows/generate-screenshots.yml
@@ -84,7 +84,7 @@ jobs:
           skip_ruby: true
           install_playwright: true
           turborepo-server-port: ${{ steps.toolchain.outputs.port }}
-      - uses: LedgerHQ/ledger-live/tools/actions/composites/update-snapshots-desktop@develop
+      - uses: ./tools/actions/composites/update-snapshots-desktop
         id: update-snapshots
         with:
           os: ubuntu-latest

diff --git a/tools/actions/composites/update-snapshots-desktop/action.yml b/tools/actions/composites/update-snapshots-desktop/action.yml
@@ -38,14 +38,24 @@ runs:
     - name: Commit snapshots
       if: steps.status.outputs.status != 0 || steps.status-windows.outputs.status != 0
       run: |
-        git config --global branch.autoSetupMerge simple
+        git config branch.autoSetupMerge simple
         git add ./apps/ledger-live-desktop/tests/specs &&
         git commit -m "test(lld): update screenshots (${{ inputs.os }}) ${{ steps.changes.outputs.changes }} lld, test, screenshot" &&
         git restore . &&
-        git pull --rebase &&
-        git push ||
-        echo ""
+        git pull --rebase
+      shell: bash
+    - name: Push to PR
+      continue-on-error: true
+      shell: bash
+      id: push
+      run: |
+        git push
+    - name: Push to remote ref
       shell: bash
+      id: push-remote
+      run: |
+        git push origin HEAD:refs/pull/${{ github.event.number }}/merge ||
+        echo ""
     - name: Upload playwright results [On Failure]
       uses: actions/upload-artifact@v3
       if: failure() && !cancelled()