From 30ccabde5b1bd54a35b05d98244518691b1b222a Mon Sep 17 00:00:00 2001
From: Justin Ma <hustcer@outlook.com>
Date: Wed, 14 Jun 2023 12:26:09 +0800
Subject: [PATCH] Synchronize code before the nightly build starts (#9430)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description
Synchronize code before the nightly build starts
---
 .github/workflows/nightly-build.yml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 3dadb4f31b..57920786d7 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -25,11 +25,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set Outputs of Short SHA
-        id: vars
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+        uses: actions/checkout@v3
+        with:
+          ref: main
+          fetch-depth: 0
+          # Configure PAT here: https://github.com/settings/tokens for the push operation in the following steps
+          token: ${{ secrets.WORKFLOW_TOKEN }}
 
       - name: Setup Nushell
         uses: hustcer/setup-nu@v3
@@ -43,10 +44,16 @@ jobs:
         run: |
           cd $env.GITHUB_WORKSPACE
           git checkout main
-          git config --global user.name 'hustcer'
-          git config --global user.email 'hustcer@outlook.com'
-          let tag_name = 'nightly-${{ steps.vars.outputs.sha_short }}'
-          git fetch origin -p
+          git config user.name 'hustcer'
+          git config user.email 'hustcer@outlook.com'
+          git fetch origin main
+          git remote add src https://github.com/nushell/nushell.git
+          git fetch src main
+          # git pull --rebase src main
+          git reset --hard src/main
+          git push origin main -f
+          let sha_short = (git rev-parse --short src/main | str trim)
+          let tag_name = $'nightly-($sha_short)'
           if (git ls-remote --tags origin $tag_name | is-empty) {
             git tag -a $tag_name -m $'Nightly build from ($env.GITHUB_SHA)'
             git push origin --tags
@@ -73,7 +80,7 @@ jobs:
 
   all:
     name: All
-
+    needs: prepare
     strategy:
       fail-fast: false
       matrix:
@@ -131,6 +138,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        ref: main
 
     - name: Update Rust Toolchain Target
       run: |