diff --git a/.github/workflows/generate-screenshots.yml b/.github/workflows/generate-screenshots.yml index 339300f142f6..beea6eafbe70 100644 --- 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 index 4a2a841051a6..eae3612d799e 100644 --- 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 orgin HEAD + - 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()