wip

dartsim · Nov 11, 2024 · e58fb54 · e58fb54
1 parent fff849e
commit e58fb54
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 34 deletions.
diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml
@@ -22,13 +22,13 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.os == 'macos-latest-large' && 'mac-x86_64' || 'mac-arm64' }}
+    name: ${{ matrix.os == 'macos-latest-large' && 'mac-x86_64' || 'mac-arm64' }}-${{ matrix.build_type }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [macos-latest]
-        build_mode: ["Release", "Debug"]
+        build_type: ["Release", "Debug"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -44,11 +44,11 @@ jobs:
       - name: Test DART and dartpy
         run: |
           VERBOSE=ON \
-          BUILD_TYPE=${{ matrix.build_mode }} \
+          BUILD_TYPE=${{ matrix.build_type }} \
           pixi run test-all
 
       - name: Install
         run: |
           VERBOSE=ON \
-          BUILD_TYPE=${{ matrix.build_mode }} \
+          BUILD_TYPE=${{ matrix.build_type }} \
           pixi run install
diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml
@@ -78,7 +78,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build_mode: ["Release", "Debug"]
+        build_type: ["Release", "Debug"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -99,11 +99,11 @@ jobs:
       - name: Test DART and dartpy
         run: |
           VERBOSE=ON \
-          BUILD_TYPE=${{ matrix.build_mode }} \
+          BUILD_TYPE=${{ matrix.build_type }} \
           pixi run test-all
 
       - name: Install
         run: |
           VERBOSE=ON \
-          BUILD_TYPE=${{ matrix.build_mode }} \
+          BUILD_TYPE=${{ matrix.build_type }} \
           pixi run install
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build_mode: ["Release", "Debug"]
+        build_type: ["Release", "Debug"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -43,11 +43,11 @@ jobs:
       - name: Test DART and dartpy
         run: |
           VERBOSE=ON \
-          BUILD_TYPE=${{ matrix.build_mode }} \
+          BUILD_TYPE=${{ matrix.build_type }} \
           pixi run test-all
 
       - name: Install
         run: |
           VERBOSE=ON \
-          BUILD_TYPE=${{ matrix.build_mode }} \
+          BUILD_TYPE=${{ matrix.build_type }} \
           pixi run install
diff --git a/pixi.toml b/pixi.toml
@@ -59,9 +59,10 @@ lint-cpp = { cmd = """
     --target format
 """, depends_on = ["config"] }
 
-lint-py = { cmd = "black . --exclude '\\..*' && isort . --skip-glob '.*'", depends_on = [
-    "config",
-] }
+lint-py = { cmd = """
+    black . --exclude '\\..*' \
+    && isort . --skip-glob '.*'
+""", depends_on = ["config"] }
 
 lint = { depends_on = ["lint-cpp", "lint-py"] }
 
@@ -71,9 +72,10 @@ check-lint-cpp = { cmd = """
         --target check-format
 """, depends_on = ["config"] }
 
-check-lint-py = { cmd = "black . --check --exclude '\\..*' && isort . --check --skip-glob '.*'", depends_on = [
-    "config",
-] }
+check-lint-py = { cmd = """
+    black . --check --exclude '\\..*' \
+    && isort . --check --skip-glob '.*'
+""", depends_on = ["config"] }
 
 check-lint = { depends_on = ["check-lint-cpp", "check-lint-py"] }
 
@@ -91,29 +93,45 @@ build-tests = { cmd = """
         --target tests
 """, depends_on = ["config"] }
 
-build-dartpy = { cmd = "cmake --build build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE -j --target dartpy", depends_on = [
-    "config",
-] }
+build-dartpy = { cmd = """
+    cmake \
+        --build build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE \
+        -j \
+        --target dartpy
+""", depends_on = ["config"] }
 
-test = { cmd = "ctest --test-dir build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE --output-on-failure", depends_on = [
-    "build-tests",
-] }
+test = { cmd = """
+    ctest \
+        --test-dir build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE \
+        --output-on-failure
+""", depends_on = ["build-tests"] }
 
-test-dartpy = { cmd = "cmake --build build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE -j --target pytest", depends_on = [
-    "config",
-] }
+test-dartpy = { cmd = """
+    cmake \
+        --build build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE \
+        -j \
+        --target pytest
+""", depends_on = ["config"] }
 
-test-all = { cmd = "cmake --build build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE -j --target ALL", depends_on = [
-    "config",
-] }
+test-all = { cmd = """
+    cmake --build build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE -j --target ALL
+""", depends_on = ["config"] }
 
-ex-atlas-puppet = { cmd = "cmake --build build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE --target atlas_puppet --parallel && ./build/bin/atlas_puppet", depends_on = [
-    "config",
-] }
+ex-atlas-puppet = { cmd = """
+    cmake \
+        --build build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE \
+        --target atlas_puppet \
+        --parallel \
+    && ./build/bin/atlas_puppet
+""", depends_on = ["config"] }
 
-ex-atlas-simbicon = { cmd = "cmake --build build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE --target atlas_simbicon --parallel && ./build/bin/atlas_simbicon", depends_on = [
-    "config",
-] }
+ex-atlas-simbicon = { cmd = """
+    cmake \
+        --build build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE \
+        --target atlas_simbicon \
+        --parallel \
+    && ./build/bin/atlas_simbicon
+""", depends_on = ["config"] }
 
 ex-hello-world = { cmd = "cmake --build build/$PIXI_ENVIRONMENT_NAME/cpp/$BUILD_TYPE --target hello_world --parallel && ./build/bin/hello_world", depends_on = [
     "config",