From add45c36c4146422c4de06c2cff8cf2a41b9e4ae Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sat, 5 Jul 2025 09:23:47 +0900 Subject: [PATCH 01/13] ci: trigger nightly after merge main --- .github/workflows/trigger-nightly.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index 2606f7dd5..32e03c800 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -18,10 +18,12 @@ jobs: repository: hi-ogawa/vite-plugin-react ref: chore-rsc-nightly token: ${{ secrets.REACT_NIGHTLY_TRIGGER_TOKEN }} - - name: push commit + - name: update branch and push commit run: | git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git fetch origin main + git merge origin/main NIGHTLY_VERSION=$(npm view react dist-tags.canary --json | jq -r 'split("-") | .[-2:] | join("-")') git commit --allow-empty -m "chore: nightly ${NIGHTLY_VERSION}" git push From 1c109e732a4254c094c7ee62eb3fd472e6948539 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sat, 5 Jul 2025 09:25:38 +0900 Subject: [PATCH 02/13] ci: tweak --- .github/workflows/trigger-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index 32e03c800..7130aefbf 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -18,7 +18,7 @@ jobs: repository: hi-ogawa/vite-plugin-react ref: chore-rsc-nightly token: ${{ secrets.REACT_NIGHTLY_TRIGGER_TOKEN }} - - name: update branch and push commit + - name: git run: | git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" From 76b9f50c7f5ffa1342d182bb4d2138163a8c18dc Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 6 Jul 2025 10:39:01 +0900 Subject: [PATCH 03/13] ci: tweak --- .github/workflows/trigger-nightly.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index 7130aefbf..2f8a103af 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -22,8 +22,9 @@ jobs: run: | git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git fetch origin main - git merge origin/main + git remote add upstream https://github.com/vitejs/vite-plugin-react.git + git fetch upstream main + git merge upstream/main NIGHTLY_VERSION=$(npm view react dist-tags.canary --json | jq -r 'split("-") | .[-2:] | join("-")') git commit --allow-empty -m "chore: nightly ${NIGHTLY_VERSION}" git push From d7f163ba3a45f102d0512cc464b04ea14f1b14d3 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 6 Jul 2025 10:45:33 +0900 Subject: [PATCH 04/13] ci: tweak --- .github/workflows/trigger-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index 2f8a103af..3083369bf 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -24,7 +24,7 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git remote add upstream https://github.com/vitejs/vite-plugin-react.git git fetch upstream main - git merge upstream/main + git merge upstream/main --allow-unrelated-histories NIGHTLY_VERSION=$(npm view react dist-tags.canary --json | jq -r 'split("-") | .[-2:] | join("-")') git commit --allow-empty -m "chore: nightly ${NIGHTLY_VERSION}" git push From 9aad320066f3ca7e5c3b88867299a30f0d1e84cf Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 6 Jul 2025 10:46:45 +0900 Subject: [PATCH 05/13] ci: tweak --- .github/workflows/trigger-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index 3083369bf..eebd96de4 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -24,7 +24,7 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git remote add upstream https://github.com/vitejs/vite-plugin-react.git git fetch upstream main - git merge upstream/main --allow-unrelated-histories + git reset --hard upstream/main NIGHTLY_VERSION=$(npm view react dist-tags.canary --json | jq -r 'split("-") | .[-2:] | join("-")') git commit --allow-empty -m "chore: nightly ${NIGHTLY_VERSION}" git push From 3d58dae4bc0b9f5e0779eb761d0ce6b9b0003bfb Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 6 Jul 2025 10:48:20 +0900 Subject: [PATCH 06/13] ci: tweak --- .github/workflows/trigger-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index eebd96de4..271fe4eeb 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -27,4 +27,4 @@ jobs: git reset --hard upstream/main NIGHTLY_VERSION=$(npm view react dist-tags.canary --json | jq -r 'split("-") | .[-2:] | join("-")') git commit --allow-empty -m "chore: nightly ${NIGHTLY_VERSION}" - git push + git push --force From d9d42b27d4b18a420a3a1fcde7b669b8a1aa5ed1 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 6 Jul 2025 10:53:52 +0900 Subject: [PATCH 07/13] ci: tweak --- .github/workflows/trigger-nightly.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index 271fe4eeb..08b3d040b 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -8,6 +8,8 @@ on: schedule: - cron: '0 0 * * *' workflow_dispatch: + # temporary for testing + push: jobs: trigger-nightly: @@ -24,7 +26,8 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git remote add upstream https://github.com/vitejs/vite-plugin-react.git git fetch upstream main - git reset --hard upstream/main + git merge upstream/main --ff-only + # git reset --hard upstream/main NIGHTLY_VERSION=$(npm view react dist-tags.canary --json | jq -r 'split("-") | .[-2:] | join("-")') git commit --allow-empty -m "chore: nightly ${NIGHTLY_VERSION}" - git push --force + git push From 8f8386c755221eb9862ba6944cb7c4c69823dc7c Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 6 Jul 2025 10:54:33 +0900 Subject: [PATCH 08/13] ci: tweak --- .github/workflows/trigger-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index 08b3d040b..2b20aa14b 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -26,7 +26,7 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git remote add upstream https://github.com/vitejs/vite-plugin-react.git git fetch upstream main - git merge upstream/main --ff-only + git merge upstream/main --ff-only --allow-unrelated-histories # git reset --hard upstream/main NIGHTLY_VERSION=$(npm view react dist-tags.canary --json | jq -r 'split("-") | .[-2:] | join("-")') git commit --allow-empty -m "chore: nightly ${NIGHTLY_VERSION}" From d2df859f28f00ad253f38911a2deb8e0cc71d362 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 6 Jul 2025 10:55:23 +0900 Subject: [PATCH 09/13] ci: tweak --- .github/workflows/trigger-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index 2b20aa14b..a55193bac 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -26,7 +26,7 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git remote add upstream https://github.com/vitejs/vite-plugin-react.git git fetch upstream main - git merge upstream/main --ff-only --allow-unrelated-histories + git merge upstream/main --allow-unrelated-histories # git reset --hard upstream/main NIGHTLY_VERSION=$(npm view react dist-tags.canary --json | jq -r 'split("-") | .[-2:] | join("-")') git commit --allow-empty -m "chore: nightly ${NIGHTLY_VERSION}" From 0e8763742ed8f0b467b0f8bac0329ef46fbee5c8 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 6 Jul 2025 10:57:52 +0900 Subject: [PATCH 10/13] ci: debug --- .github/workflows/trigger-nightly.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index a55193bac..61dbe4b5c 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -22,10 +22,12 @@ jobs: token: ${{ secrets.REACT_NIGHTLY_TRIGGER_TOKEN }} - name: git run: | + git log git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git remote add upstream https://github.com/vitejs/vite-plugin-react.git git fetch upstream main + git log upstream/main git merge upstream/main --allow-unrelated-histories # git reset --hard upstream/main NIGHTLY_VERSION=$(npm view react dist-tags.canary --json | jq -r 'split("-") | .[-2:] | join("-")') From 812efd6d1d841403d3ee3c0e169d8001aa99dcdd Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 6 Jul 2025 10:59:56 +0900 Subject: [PATCH 11/13] ci: tweak --- .github/workflows/trigger-nightly.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index 61dbe4b5c..dc9e6ec36 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -20,16 +20,15 @@ jobs: repository: hi-ogawa/vite-plugin-react ref: chore-rsc-nightly token: ${{ secrets.REACT_NIGHTLY_TRIGGER_TOKEN }} + fetch-depth: 0 - name: git run: | - git log - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git remote add upstream https://github.com/vitejs/vite-plugin-react.git git fetch upstream main - git log upstream/main - git merge upstream/main --allow-unrelated-histories - # git reset --hard upstream/main + git merge upstream/main + + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" NIGHTLY_VERSION=$(npm view react dist-tags.canary --json | jq -r 'split("-") | .[-2:] | join("-")') git commit --allow-empty -m "chore: nightly ${NIGHTLY_VERSION}" git push From 201b7a9699d0679bb4beaec9140ce472f6cde709 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 6 Jul 2025 11:05:22 +0900 Subject: [PATCH 12/13] ci: tweak --- .github/workflows/trigger-nightly.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index dc9e6ec36..a211bd011 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -23,12 +23,13 @@ jobs: fetch-depth: 0 - name: git run: | + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git remote add upstream https://github.com/vitejs/vite-plugin-react.git git fetch upstream main git merge upstream/main - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" NIGHTLY_VERSION=$(npm view react dist-tags.canary --json | jq -r 'split("-") | .[-2:] | join("-")') git commit --allow-empty -m "chore: nightly ${NIGHTLY_VERSION}" git push From 83f6ce2c56e51774f672ea8730e440249767d932 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Sun, 6 Jul 2025 11:07:32 +0900 Subject: [PATCH 13/13] ci: cleanup --- .github/workflows/trigger-nightly.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/trigger-nightly.yml b/.github/workflows/trigger-nightly.yml index a211bd011..df45b1a14 100644 --- a/.github/workflows/trigger-nightly.yml +++ b/.github/workflows/trigger-nightly.yml @@ -8,8 +8,6 @@ on: schedule: - cron: '0 0 * * *' workflow_dispatch: - # temporary for testing - push: jobs: trigger-nightly: