From 8dbe323dff17f6996c5b6b7decbf3afe3fc1b00e Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Wed, 7 Apr 2021 15:34:11 +0300 Subject: [PATCH] ci: gen_vc: fix a race --- .github/workflows/gen_vc.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/gen_vc.yml b/.github/workflows/gen_vc.yml index 8f1d047f14..c9ef361594 100644 --- a/.github/workflows/gen_vc.yml +++ b/.github/workflows/gen_vc.yml @@ -21,8 +21,6 @@ jobs: COMMIT_MSG=$(git log -1 --oneline --pretty='%s' HEAD) rm -rf vc - echo "cloning, secret=" - echo "${{ secrets.VLANG_BOT_SECRET }}" git clone https://vlang-bot:${{ secrets.VLANG_BOT_SECRET }}@github.com/vlang/vc.git rm -rf vc/v.c vc/v_win.c @@ -40,4 +38,5 @@ jobs: git -C vc add v.c v_win.c git -C vc commit -m "[v:master] $COMMIT_HASH - $COMMIT_MSG" + git pull --rebase origin master # in case there are recent commits git -C vc push