From 3796eccd92a553740656440ea51e8fba7cd98e14 Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Thu, 16 Mar 2023 20:01:57 +0800 Subject: [PATCH] fix(ci): update again --- .github/workflows/update-nightly.yml | 4 +++- .github/workflows/update.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index 0bc06b16b4..87254befbf 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -40,7 +40,9 @@ jobs: git commit -S -a -m "$msg" git format-patch HEAD^ git checkout f38 - git apply *.patch + for file in *.patch; do + git apply $file || true + done rm *.patch git commit -S -a -m "$msg" git push -u origin f38 diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 58d70e9065..d3bb303cf7 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -41,7 +41,9 @@ jobs: git commit -S -a -m "$msg" git format-patch HEAD^ git checkout f38 - git apply *.patch + for file in *.patch; do + git apply $file || true + done rm *.patch git commit -S -a -m "$msg" git push -u origin f38