From 2985b6bba9f221489623ed242e06c65f48e2f193 Mon Sep 17 00:00:00 2001
From: Thomas Benz <tbenz@iis.ee.ethz.ch>
Date: Mon, 26 Feb 2024 12:39:12 +0100
Subject: [PATCH] Update version

---
 .github/workflows/{analyze.yml => analyze.yml.off}     | 0
 .github/workflows/{build.yml => build.yml.off}         | 0
 .github/workflows/{docs.yml => docs.yml.off}           | 0
 .github/workflows/{gitlab-ci.yml => gitlab-ci.yml.off} | 0
 .github/workflows/{lint.yml => lint.yml.off}           | 0
 VERSION                                                | 2 +-
 util/deploy.py                                         | 2 +-
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename .github/workflows/{analyze.yml => analyze.yml.off} (100%)
 rename .github/workflows/{build.yml => build.yml.off} (100%)
 rename .github/workflows/{docs.yml => docs.yml.off} (100%)
 rename .github/workflows/{gitlab-ci.yml => gitlab-ci.yml.off} (100%)
 rename .github/workflows/{lint.yml => lint.yml.off} (100%)

diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml.off
similarity index 100%
rename from .github/workflows/analyze.yml
rename to .github/workflows/analyze.yml.off
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml.off
similarity index 100%
rename from .github/workflows/build.yml
rename to .github/workflows/build.yml.off
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml.off
similarity index 100%
rename from .github/workflows/docs.yml
rename to .github/workflows/docs.yml.off
diff --git a/.github/workflows/gitlab-ci.yml b/.github/workflows/gitlab-ci.yml.off
similarity index 100%
rename from .github/workflows/gitlab-ci.yml
rename to .github/workflows/gitlab-ci.yml.off
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml.off
similarity index 100%
rename from .github/workflows/lint.yml
rename to .github/workflows/lint.yml.off
diff --git a/VERSION b/VERSION
index 5d4294b9..eace7d32 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.1
\ No newline at end of file
+0.6.0-beta
\ No newline at end of file
diff --git a/util/deploy.py b/util/deploy.py
index 35c7964c..dbd76c79 100644
--- a/util/deploy.py
+++ b/util/deploy.py
@@ -41,7 +41,7 @@
 # create target branch
 deploy_branch = f'__deploy__{current_branch}'
 print(f'Deploy branch: {deploy_branch}\n\n')
-last_deploy_hash = os.popen(f'{CHECK_BRANCH_CMD} {deploy_branch}').read()
+last_deploy_hash = os.popen(f'{CHECK_BRANCH_CMD} {ORIGIN}/{deploy_branch}').read()
 print(f'Last deploy hash: {last_deploy_hash} (empty if on deploy branch present)')
 deploy_msg = f'{current_msg}\n-----\n\nDeployed from {current_hash}'
 print(f'Deploy commit message:\n{deploy_msg}')