From 115688bee3f34d62bb4b7e4c1e5834e52352f6c8 Mon Sep 17 00:00:00 2001 From: Thomas Benz Date: Mon, 26 Feb 2024 10:58:50 +0100 Subject: [PATCH] fixv3 --- .github/workflows/deploy.yml | 6 +++++- util/deploy.py | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5cfbbe69..c733f4ae 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -44,4 +44,8 @@ jobs: run: make -B idma_hw_all - name: Deploy generated files - run: python3 util/deploy.py + run: | + git config user.email "github-ci@iis.ee.ethz.ch" + git config user.name "github-ci" + git fetch --all + python3 util/deploy.py diff --git a/util/deploy.py b/util/deploy.py index 196cd1eb..89afa929 100644 --- a/util/deploy.py +++ b/util/deploy.py @@ -40,6 +40,10 @@ last_deploy_hash = os.popen(f'{CHECK_BRANCH_CMD} {deploy_branch}').read() deploy_msg = f'{current_msg}\n-----\n\nDeployed from {current_hash}' +# checkout current working branch +os.popen(f'{GIT_CHECKOUT_CMD} {current_branch}') +time.sleep(0.5) + # spawn or switch to deploy branch if last_deploy_hash == '': # create new deploy branch