Merge pull request #46 from ORNL-Fusion/master_dev

Master dev
ORNL-Fusion · Feb 14, 2024 · 051c571 · 051c571
2 parents 7f5eaf0 + bcfb567
commit 051c571
Show file tree

Hide file tree

Showing 5 changed files with 122 additions and 98 deletions.
diff --git a/.github/workflows/ci_test.yaml b/.github/workflows/ci_test.yaml
@@ -55,10 +55,16 @@ jobs:
               shell: bash
               working-directory: ${{runner.workspace}}/Stellarator-Tools/build
               run: make -j VERBOSE=1
-            - name: Test
+            - name: Test Mac
+              if: ${{matrix.os == 'macos-latest'}}
+              shell: bash
+              working-directory: ${{runner.workspace}}/Stellarator-Tools/build
+              run: make test ARGS=-j3
+            - name: Test Linux
+              if: ${{matrix.os == 'ubuntu-latest'}}
               shell: bash
               working-directory: ${{runner.workspace}}/Stellarator-Tools/build
-              run: make test
+              run: make test ARGS=-j2
             - name: Show Log
               if: failure()
               shell: bash

diff --git a/.github/workflows/ci_test_master.yaml b/.github/workflows/ci_test_master.yaml
@@ -55,10 +55,16 @@ jobs:
               shell: bash
               working-directory: ${{runner.workspace}}/Stellarator-Tools/build
               run: make -j VERBOSE=1
-            - name: Test
+            - name: Test Mac
+              if: ${{matrix.os == 'macos-latest'}}
+              shell: bash
+              working-directory: ${{runner.workspace}}/Stellarator-Tools/build
+              run: make test ARGS=-j3
+            - name: Test Linux
+              if: ${{matrix.os == 'ubuntu-latest'}}
               shell: bash
               working-directory: ${{runner.workspace}}/Stellarator-Tools/build
-              run: make test
+              run: make test ARGS=-j2
             - name: Show Log
               if: failure()
               shell: bash