fixv5

pulp-platform · Feb 26, 2024 · 9ebc232 · 9ebc232
1 parent 2d90b87
commit 9ebc232
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -39,13 +39,16 @@ jobs:
         rm -f morty-ubuntu.22.04-x86_64.tar.gz
         chmod 777 morty
         echo "PATH=.:$PATH" >> ${GITHUB_ENV}
+    - name: Clean clone
+      run: git clone git@github.com:pulp-platform/iDMA.git checkout-deploy
     -
       name: Build hardware
-      run: make -B idma_hw_all
+      run: make -BC checkout-deploy idma_hw_all
     -
       name: Deploy generated files
       run: |
         git config user.email "github-ci@iis.ee.ethz.ch"
         git config user.name "github-ci"
+        cd checkout-deploy
         git fetch --all
         python3 util/deploy.py
diff --git 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}')