From 7a7dbd66d36b584a0fb33ab3583a3e5ec2ef47ef Mon Sep 17 00:00:00 2001
From: Thomas Kittelmann <thomas.kittelmann@ess.eu>
Date: Tue, 5 Mar 2024 20:33:12 +0100
Subject: [PATCH] trigger CI2

---
 .github/workflows/condatest_essncrystaldev.yml     | 14 +++++++++-----
 .../workflows/condatest_essncrystaldev_long.yml    | 13 +++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/condatest_essncrystaldev.yml b/.github/workflows/condatest_essncrystaldev.yml
index 724ced0..c577fe7 100644
--- a/.github/workflows/condatest_essncrystaldev.yml
+++ b/.github/workflows/condatest_essncrystaldev.yml
@@ -64,16 +64,20 @@ jobs:
       - name: Install extra conda pkgs
         run: conda install --yes mpmath spglib gemmi ase pymatgen
 
+      - name: Build (release mode)
+        id: build-release-mode
+        run: |
+          set -eu
+          cd src_testproject
+          sb
 
-      - name: Build and test release mode
-        id: build-and-test-release-mode
+      - name: Launch unit tests (release mode)
+        id: test-release-mode
         run: |
           set -eu
-          geant4-config  --version
           cd src_testproject
           #NCLong* tests are run in a different workflow:
-          set -x
-          unwrapped_simplebuild -t --testexcerpts=100 --requirepkg=DGCodeRecommended,NCUtils,NCG4,NCTests,NCThreadVal,NCPerfVal --testfilter='!sb_nclong*'
+          sb -t --testexcerpts=100 --requirepkg=DGCodeRecommended,NCUtils,NCG4,NCTests,NCThreadVal,NCPerfVal --testfilter='!sb_nclong*'
 
       - name: Setup tmate session for manual debugging
         uses: mxschmitt/action-tmate@v3
diff --git a/.github/workflows/condatest_essncrystaldev_long.yml b/.github/workflows/condatest_essncrystaldev_long.yml
index 84fd344..d5ef88b 100644
--- a/.github/workflows/condatest_essncrystaldev_long.yml
+++ b/.github/workflows/condatest_essncrystaldev_long.yml
@@ -64,13 +64,18 @@ jobs:
       - name: Install extra conda pkgs
         run: conda install --yes mpmath spglib gemmi ase pymatgen
 
-      - name: Build and test release mode
-        id: build-and-test-release-mode
+      - name: Build (release mode)
+        id: build-release-mode
         run: |
           set -eu
-          geant4-config  --version
           cd src_testproject
           sb
+
+      - name: Launch unit tests (release mode)
+        id: test-release-mode
+        run: |
+          set -eu
+          cd src_testproject
           export tmp='sb_nclong*'
           if [ "$RUNNER_OS" == "macOS" ]; then
             #Disable a few specific tests on macos until
@@ -83,7 +88,7 @@ jobs:
           fi
           echo "Using --testfilter=${tmp}"
           set -x
-          unwrapped_simplebuild -t -j4 --testexcerpts=100 --requirepkg='NCLongExtraTests,NCLongG4Tests,NCLongTests' --testfilter="${tmp}"
+          sb -t -j4 --testexcerpts=100 --requirepkg='NCLongExtraTests,NCLongG4Tests,NCLongTests' --testfilter="${tmp}"
 
       - name: Setup tmate session for manual debugging
         uses: mxschmitt/action-tmate@v3