From 2f4289fda8b21d5b4f47d7ffe6286b5b8da66e0f Mon Sep 17 00:00:00 2001 From: Corey Martin Date: Fri, 3 Apr 2026 14:45:09 -0700 Subject: [PATCH] Test: enable destination rebase for copybara webdev sync Remove --nogit-destination-rebase so copybara rebases the sync commit onto current webdev main. This was originally disabled due to merge conflicts, but those may have been from a one-time issue. If the rebase succeeds, it eliminates the stale PR branch problem entirely. Also temporarily enables the create-webdev-pr job on PRs (not just push to main) so we can test the copybara flow without merging to main. The "Reset develop to main" step is gated to push-only to avoid destructive side effects on PR runs. Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/test-release-sync.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-release-sync.yaml b/.github/workflows/test-release-sync.yaml index 0ab0bdb58..0f343b69b 100644 --- a/.github/workflows/test-release-sync.yaml +++ b/.github/workflows/test-release-sync.yaml @@ -255,7 +255,7 @@ jobs: create-webdev-pr: name: Create Webdev PR - if: "github.event_name == 'push'" + if: "github.event_name == 'push' || github.event_name == 'pull_request'" runs-on: "ubuntu-22.04" environment: npm permissions: @@ -267,6 +267,7 @@ jobs: fetch-depth: 0 - name: Reset develop to main + if: "github.event_name == 'push'" run: | git checkout develop git reset --hard origin/main @@ -317,7 +318,7 @@ jobs: curl https://lsdev-repo.s3-us-west-2.amazonaws.com/github-actions/copybara_deploy.jar --output ./copybara.jar trap on_exit EXIT - java -jar copybara.jar ./copy.bara.sky js-sdk-push-to-webdev --nogit-destination-rebase + java -jar copybara.jar ./copy.bara.sky js-sdk-push-to-webdev - name: "Notify failure on Slack" if: "failure() && github.event_name == 'push'"