From 12c45b75abbfa0c3d3c55ea9abd0b7819a6b5a80 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 12 Dec 2024 22:03:52 +0800 Subject: [PATCH] fix(ci/update-nightly): apply patch correctly (#2607) Signed-off-by: madomado --- .github/workflows/update-nightly.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index a2429fd37f..d35eda3e47 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -38,12 +38,11 @@ jobs: git config user.signingkey "${{ runner.temp }}/signing_key" msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')" git commit -S -a -m "$msg" + git format-patch HEAD^ copy_over () { - git format-patch HEAD^ git checkout $1 git apply *.patch || true - rm *.patch - git add * + git add anda git commit -S -a -m "$msg" } copy_over f39 || true