From 7228e0e7ad1e9a8d15754dbd60863c95c31b4ebf Mon Sep 17 00:00:00 2001
From: Thomas Benz <tbenz@iis.ee.ethz.ch>
Date: Mon, 26 Feb 2024 12:03:36 +0100
Subject: [PATCH] fixv5

---
 .github/workflows/deploy.yml | 6 ++++--
 util/deploy.py               | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c733f4ae..b33e462e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -16,7 +16,9 @@ jobs:
     steps:
     -
       name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+      with:
+          fetch-depth: 0
     -
       name: Install Python
       uses: actions/setup-python@v4
@@ -41,7 +43,7 @@ jobs:
         echo "PATH=.:$PATH" >> ${GITHUB_ENV}
     -
       name: Build hardware
-      run: make -B idma_hw_all
+      run: make -BC idma_hw_all
     -
       name: Deploy generated files
       run: |
diff --git a/util/deploy.py b/util/deploy.py
index 97cb8cb0..63a6c23d 100644
--- a/util/deploy.py
+++ b/util/deploy.py
@@ -21,7 +21,7 @@
 GIT_CHECKOUT_CMD = 'git checkout'
 GIT_CHECKOUT_TAG_CMD = 'git checkout -b'
 GIT_COMMIT_CMD = 'git commit -m'
-GIT_MERGE_SQUASH_CMD = 'git merge --squash --allow-unrelated-histories'
+GIT_MERGE_SQUASH_CMD = 'git merge --squash'
 GIT_PUSH_CMD = 'git push'
 
 # Repo configuration
@@ -76,5 +76,5 @@
 os.popen(f'{GIT_COMMIT_CMD} "{deploy_msg}"')
 time.sleep(0.5)
 
-# push state to origin
-os.popen(f'{GIT_PUSH_CMD} {ORIGIN} {deploy_branch}')
+## push state to origin
+#os.popen(f'{GIT_PUSH_CMD} {ORIGIN} {deploy_branch}')