From 7edfb3f3c53194a73a6b2b34cb7bb9c0196f5399 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 4 May 2023 10:05:39 +0800 Subject: [PATCH] fix(ci): update-nightly Signed-off-by: madomado --- .github/workflows/update-nightly.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index dceda6d9e9..4d90f1241d 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -8,7 +8,7 @@ jobs: autoupdate: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:38 + image: ghcr.io/terrapkg/builder:f38 options: --cap-add=SYS_ADMIN --privileged steps: - name: Checkout @@ -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