Another try

BoothGroup · Jul 19, 2024 · aae9ab8 · aae9ab8
1 parent afeca3c
commit aae9ab8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/bootstrap.yaml b/.github/workflows/bootstrap.yaml
@@ -43,16 +43,15 @@ jobs:
         run: |
           git fetch --all
           git pull origin bootstrap
-          git pull origin bootstrap_ci
-          git checkout bootstrap_ci
-          git merge bootstrap
+          git checkout bootstrap
           chmod +x .github/workflows/bootstrap_all.sh
           cd ebcc/codegen && ./../../.github/workflows/bootstrap_all.sh
           git config --global user.name "github-actions[bot]"
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git checkout -b bootstrap_ci
           git add *.py
           git commit -m "Bootstrap via ${{ github.sha }}"
-          git push origin bootstrap_ci
+          git push origin bootstrap_ci --force
       - name: Run unit tests
         run: |
           python -m pip install pytest

diff --git a/ebcc/codegen/bootstrap_MPn.py b/ebcc/codegen/bootstrap_MPn.py
@@ -8,7 +8,7 @@
 from albert.qc._pdaggerq import import_from_pdaggerq
 from albert.tensor import Tensor
 
-from ebcc.codegen import hugenholtz
+from ebcc.codegen import bootstrap_hugenholtz as hugenholtz
 from ebcc.codegen.bootstrap_common import *
 
 # Get the spin case

diff --git a/ebcc/codegen/hugenholtz.py → ebcc/codegen/bootstrap_hugenholtz.py b/ebcc/codegen/hugenholtz.py → ebcc/codegen/bootstrap_hugenholtz.py