From e22d279c8d6895d03f86fbfe574e031431caa576 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Sat, 26 Mar 2022 02:30:05 +0100 Subject: [PATCH] gh: git related fixes --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43950096..7c169c25 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,13 +64,13 @@ jobs: rm -rf $(ls -a | grep -v '^\.git$' | grep -v '^\.\.$' | grep -v '^\.$' | grep -v '^build$') cp -r build/bin/. ./ rm -rf build - git add . + git add -f . git commit -m "Binary release $TAG_NAME" git push origin $BRANCH_NAME-binary git tag $TAG_NAME-binary git push origin $BRANCH_NAME-binary --tags git checkout latest-binary - git rebase $BRANCH_NAME-binary && git push origin latest-binary + git reset --hard $BRANCH_NAME-binary && git push -f origin latest-binary - name: Cleanup source tree run: git checkout $TAG_NAME && rm -rf * && git checkout .