From 01c336a4e897af1d08e0bd429a057e5b57911b35 Mon Sep 17 00:00:00 2001 From: lleyton Date: Wed, 3 May 2023 19:03:16 -0700 Subject: [PATCH] fix: fix nightly patch mechanism (#418) --- .github/workflows/update-nightly.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index d30d78b642..4d90f1241d 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -38,14 +38,13 @@ 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^ - git checkout f38 - git apply *.patch || true - git add anda - git commit -S -a -m "$msg" - git checkout f37 - git apply *.patch || true - git add anda - git commit -S -a -m "$msg" + f37 () { + git format-patch HEAD^ + git checkout f37 + git apply *.patch || true + git add * + git commit -S -a -m "$msg" + } + f37 || true git push -u origin --all fi