chore(bot): fix git push

chore(actions): update git config for forks

!drop

.github/workflows/generate-screenshots.yml

@@ -84,10 +84,11 @@ 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: LedgerHQ/ledger-live/tools/actions/composites/update-snapshots-desktop@chore/update-push-on-forks
         id: update-snapshots
         with:
           os: ubuntu-latest
+          prNumber: ${{ inputs.number }}
 
   report-start:
     name: Report start

tools/actions/composites/update-snapshots-desktop/action.yml

@@ -4,6 +4,9 @@ inputs:
   os:
     description: "name of the os (same as runs-on)"
     required: true
+  prNumber:
+    description: "PR number"
+    required: true
 
 runs:
   using: "composite"
@@ -38,13 +41,25 @@ runs:
     - name: Commit snapshots
       if: steps.status.outputs.status != 0 || steps.status-windows.outputs.status != 0
       run: |
+        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
+      if: steps.push.outcome == 'failure'
+      run: |
+        git push origin HEAD:refs/pull/${{ inputs.prNumber }}/merge ||
+        echo ""
     - name: Upload playwright results [On Failure]
       uses: actions/upload-artifact@v3
       if: failure() && !cancelled()

tools/github-bot/src/commands/generate-screenshots.ts

@@ -68,12 +68,16 @@ export function generateScreenshots(app: Probot) {
     const number = payload.check_run.pull_requests[0]?.number;
     const login = payload.sender.login;
 
-    const res = await context.octokit.orgs.checkMembershipForUser({
-      org: "LedgerHQ",
-      username: login,
-    });
+    try {
+      const res = await context.octokit.orgs.checkMembershipForUser({
+        org: "LedgerHQ",
+        username: login,
+      });
 
-    if (res.status >= 300) return;
+      if (res.status >= 300) return;
+    } catch (error) {
+      return;
+    }
 
     if (!number) return;
 

tools/github-bot/src/commands/regen-doc.ts

@@ -69,12 +69,16 @@ export function regenDoc(app: Probot) {
     const number = payload.check_run.pull_requests[0]?.number;
     const login = payload.sender.login;
 
-    const res = await context.octokit.orgs.checkMembershipForUser({
-      org: "LedgerHQ",
-      username: login,
-    });
+    try {
+      const res = await context.octokit.orgs.checkMembershipForUser({
+        org: "LedgerHQ",
+        username: login,
+      });
 
-    if (res.status >= 300) return;
+      if (res.status >= 300) return;
+    } catch (error) {
+      return;
+    }
 
     if (!number) return;
 

tools/github-bot/src/commands/regen-pods.ts

@@ -69,12 +69,16 @@ export function regenPods(app: Probot) {
     const number = payload.check_run.pull_requests[0]?.number;
     const login = payload.sender.login;
 
-    const res = await context.octokit.orgs.checkMembershipForUser({
-      org: "LedgerHQ",
-      username: login,
-    });
+    try {
+      const res = await context.octokit.orgs.checkMembershipForUser({
+        org: "LedgerHQ",
+        username: login,
+      });
 
-    if (res.status >= 300) return;
+      if (res.status >= 300) return;
+    } catch (error) {
+      return;
+    }
 
     if (!number) return;
 

tools/github-bot/src/index.ts

@@ -3,7 +3,6 @@ import { upToDate } from "./features/upToDate";
 import { orchestrator } from "./features/orchestrator";
 import { lintCommits } from "./features/lintCommits";
 import { generateScreenshots } from "./commands/generate-screenshots";
-import { runDesktopTestSuite } from "./commands/full-suite";
 import { regenPods } from "./commands/regen-pods";
 import { regenDoc } from "./commands/regen-doc";
 import { autoClose } from "./features/autoClose";
@@ -17,8 +16,6 @@ export default (app: Probot) => {
   regenPods(app);
   // /regen-doc command
   regenDoc(app);
-  // /full-lld-tests
-  runDesktopTestSuite(app);
 
   /* PR stuff */