From 47c2cec62a245a532a18b37a2be754436dbca681 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 21 Apr 2026 03:08:36 +0000 Subject: [PATCH 1/4] Initial plan From e00223bdddc7a332a3003ffd03cf82ac76631680 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 21 Apr 2026 03:10:51 +0000 Subject: [PATCH 2/4] fix(workflow): discard lockfile changes before scheduled git rebase Agent-Logs-Url: https://github.com/adobe/aio-e2e-tests/sessions/0f40c1ae-f7dd-4b6e-9884-d6260865bb93 Co-authored-by: shazron <36107+shazron@users.noreply.github.com> --- .github/workflows/app-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/app-test.yml b/.github/workflows/app-test.yml index c721fea5..6efa7d6f 100644 --- a/.github/workflows/app-test.yml +++ b/.github/workflows/app-test.yml @@ -55,6 +55,7 @@ jobs: set -euo pipefail git config user.name adobe-bot git config user.email grp-opensourceoffice@adobe.com + git restore --worktree --staged package-lock.json || git checkout -- package-lock.json || true git fetch origin master git checkout master git pull --rebase origin master From 0b1de6dcd6203243beea0bf08d4818375179e5b1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 21 Apr 2026 03:11:42 +0000 Subject: [PATCH 3/4] refactor(workflow): avoid swallowing git cleanup failures Agent-Logs-Url: https://github.com/adobe/aio-e2e-tests/sessions/0f40c1ae-f7dd-4b6e-9884-d6260865bb93 Co-authored-by: shazron <36107+shazron@users.noreply.github.com> --- .github/workflows/app-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/app-test.yml b/.github/workflows/app-test.yml index 6efa7d6f..4c399489 100644 --- a/.github/workflows/app-test.yml +++ b/.github/workflows/app-test.yml @@ -55,7 +55,7 @@ jobs: set -euo pipefail git config user.name adobe-bot git config user.email grp-opensourceoffice@adobe.com - git restore --worktree --staged package-lock.json || git checkout -- package-lock.json || true + git restore --worktree --staged package-lock.json || git checkout -- package-lock.json git fetch origin master git checkout master git pull --rebase origin master From 2e07db0638d7323cbb31edae4bfd7bbd6f2a23fb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 21 Apr 2026 03:12:23 +0000 Subject: [PATCH 4/4] fix(workflow): use restore-only lockfile cleanup before rebase Agent-Logs-Url: https://github.com/adobe/aio-e2e-tests/sessions/0f40c1ae-f7dd-4b6e-9884-d6260865bb93 Co-authored-by: shazron <36107+shazron@users.noreply.github.com> --- .github/workflows/app-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/app-test.yml b/.github/workflows/app-test.yml index 4c399489..8b5e67fa 100644 --- a/.github/workflows/app-test.yml +++ b/.github/workflows/app-test.yml @@ -55,7 +55,7 @@ jobs: set -euo pipefail git config user.name adobe-bot git config user.email grp-opensourceoffice@adobe.com - git restore --worktree --staged package-lock.json || git checkout -- package-lock.json + git restore --worktree --staged package-lock.json || true git fetch origin master git checkout master git pull --rebase origin master