From 35bd25160d47044215447189fcadfb27d085cd2f Mon Sep 17 00:00:00 2001 From: rjshrjndrn Date: Mon, 26 May 2025 15:27:30 +0200 Subject: [PATCH] fix(build): remove fetch depth, as it might cause issue in rebase Signed-off-by: rjshrjndrn --- .github/workflows/patch-build.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/patch-build.yaml b/.github/workflows/patch-build.yaml index b600cc72e..a53b09adb 100644 --- a/.github/workflows/patch-build.yaml +++ b/.github/workflows/patch-build.yaml @@ -19,11 +19,19 @@ jobs: DEPOT_PROJECT_ID: ${{ secrets.DEPOT_PROJECT_ID }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GITHUB_TOKEN }} - name: Rebase with main branch, to make sure the code has latest main changes run: | - git fetch origin main - git rebase origin/main + git remote -v + git config --global user.email "action@github.com" + git config --global user.name "GitHub Action" + git config --global rebase.autoStash true + git fetch origin main:main + git rebase main + git log -3 - name: Downloading yq run: |