NEO-RT simplified

itpplasma · Feb 14, 2025 · 951bbdd · 951bbdd
1 parent 85c3c85
commit 951bbdd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 49 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -83,31 +83,34 @@ jobs:
         run: |
           source activate.sh
           clone_github NEO-2
-          pushd NEO-2
-            make
-          popd
+          cd NEO-2
+          $CODE/scripts/checkout_branch.sh $CODE_BRANCH
+          make
 
       - name: NEO-RT
         run: |
           source activate.sh
           clone_github NEO-RT
-          source scripts/setup/neort.sh
+          cd NEO-RT
+          $CODE/scripts/checkout_branch.sh $CODE_BRANCH
+          make
 
       - name: SIMPLE
         run: |
           source activate.sh
           clone_github SIMPLE
-          pushd SIMPLE
-            make
-          popd
+          cd SIMPLE
+          $CODE/scripts/checkout_branch.sh $CODE_BRANCH
+          make
+
 
       - name: GORILLA
         run: |
           source activate.sh
           clone_github GORILLA
-          pushd GORILLA
-            make
-          popd
+          cd GORILLA
+          $CODE/scripts/checkout_branch.sh $CODE_BRANCH
+          make
 
       - name: MEPHIT
         run: |

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -137,12 +137,12 @@ neort:
     - export CODE=`pwd`
     - source scripts/util.sh
     - set_branch
-    - source scripts/setup/neort.sh
+    - clone_github NEO-RT
+    - cd NEO-RT
+    - ../scripts/checkout_branch.sh $CI_COMMIT_REF_NAME
+    - make
   artifacts:
     paths:
-      - contrib/
-      - spline/
-      - BOOZER_MAGFIE/
       - NEO-RT/
 
 simple:

diff --git a/scripts/setup/neort.sh b/scripts/setup/neort.sh