move the build steps into scripts

madhephaestus · madhephaestus · commit 4dea83decbcc · 2026-03-06T09:12:12.000-05:00
diff --git a/.github/workflows/manifold.yml b/.github/workflows/manifold.yml
@@ -13,118 +13,6 @@ on:
     branches: [ master, main ]
 
 jobs:
-  build_linux:
-    timeout-minutes: 45
-    strategy:
-      matrix:
-        cuda_support: [OFF]
-        parallel_backend: [NONE]
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.draft == false || startsWith(github.ref, 'refs/tags/')
-    outputs:
-      java_package_version_changed: ${{ steps.check_version.outputs.changed }}
-    container:
-      image: docker://nvidia/cuda:12.0.1-devel-ubuntu22.04
-    steps:
-    - name: Install dependencies
-      run: |
-        apt-get -y update
-        DEBIAN_FRONTEND=noninteractive apt install -y libomp-dev libassimp-dev git libtbb-dev pkg-config libpython3-dev python3 python3-distutils python3-pip lcov
-        pip install trimesh
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-        fetch-depth: 2
-    - uses: jwlawson/actions-setup-cmake@v1.12
-    - name: Setup Java
-      uses: actions/setup-java@v2
-      with:
-        java-version: '21'
-        distribution: 'adopt'
-    - name: Install Maven
-      run: |
-        apt-get update
-        apt-get install -y maven
-    - name: Cache Maven packages
-      uses: actions/cache@v3
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
-    - name: Build ${{matrix.backend}}
-      run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=Release -DASSIMP_ENABLE=ON -DBUILD_SHARED_LIBS=ON -DMANIFOLD_DEBUG=ON -DMANIFOLD_EXPORT=ON -DMANIFOLD_PAR=${{matrix.parallel_backend}} -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .. && make
-    - name: Get version
-      id: get_version
-      run: echo "VERSION=$(cat bindings/java/version.txt)" >> $GITHUB_ENV
-      shell: bash
-    - name: Check if version has changed
-      id: check_version
-      shell: bash
-      run: |
-        if git diff --quiet HEAD~1 -- bindings/java/version.txt
-        then
-          echo "Version Unchanged!"
-          echo "changed=false" >> "$GITHUB_OUTPUT"
-        else
-          echo "Version Changed!"
-          echo "changed=true" >> "$GITHUB_OUTPUT"
-        fi
-    - name: Build Java package
-      shell: bash
-      run: |
-        cd bindings/java
-
-        BACKEND=""
-        if [ "${{matrix.parallel_backend}}" = "NONE" ] && [ "${{matrix.cuda_support}}" = "ON" ]; then
-            BACKEND="-cuda"
-        elif [ "${{matrix.parallel_backend}}" = "NONE" ] && [ "${{matrix.cuda_support}}" = "OFF" ]; then
-            BACKEND=""
-        elif [ "${{matrix.cuda_support}}" = "ON" ]; then
-            BACKEND="-${{matrix.parallel_backend}}-cuda"
-        else
-            BACKEND="-${{matrix.parallel_backend}}"
-        fi
-
-        mvn versions:set -DnewVersion=$(cat version.txt) --file pom.xml
-        mvn package -Dos.classifier=linux$BACKEND-x86_64
-        find  ./target/classes/ -name "*.class" -delete
-    # - name: Test ${{matrix.parallel_backend}} with CUDA ${{matrix.cuda_support}}
-    #   # note that the test for CUDA backend does not really test CUDA, as we
-    #   # don't have CUDA GPU on GitHub Action
-    #   if: matrix.parallel_backend != 'NONE' || matrix.cuda_support != 'OFF'
-    #   run: |
-    #     export PYTHONPATH=$PYTHONPATH:$(pwd)/build/bindings/python
-    #     cd build/test
-    #     ./manifold_test
-    #- name: Coverage Report
-    #  # only do code coverage for default sequential backend, it seems that TBB
-    #  # backend will cause failure
-    #  # perhaps issue related to invalid memory access?
-    #  if: matrix.parallel_backend == 'NONE' && matrix.cuda_support == 'OFF'
-    #  run: |
-    #    cd build
-    #    cmake -DOUTPUT_TO_BIN=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DMANIFOLD_PAR=${{matrix.parallel_backend}} -DMANIFOLD_USE_CUDA=${{matrix.cuda_support}} -DCODE_COVERAGE=ON .. && make
-    #    lcov --capture --initial --directory . --output-file ./code_coverage_init.info
-    #    cd bin
-    #    ./manifold_test
-    #    cd ../
-    #    lcov --capture --directory . --output-file ./code_coverage_test.info
-    #    lcov --add-tracefile ./code_coverage_init.info --add-tracefile ./code_coverage_test.info --output-file ./code_coverage_total.info
-    #    lcov --remove ./code_coverage_total.info '/usr/*' '*/third_party/*' '*/test/*' '*/extras/*' '*/bindings/*' --output-file ./code_coverage.info
-    - uses: codecov/codecov-action@v2
-      with:
-        files: build/code_coverage.info
-        fail_ci_if_error: false
-        name: ${{matrix.parallel_backend}}-${{matrix.cuda_support}}
-    - name: Upload artifact
-      uses: actions/upload-artifact@v4  # updated from v3
-      with:
-        name: manifold_java_bindings_linux_${{env.VERSION}}
-        path: bindings/java/target/classes/
-
   build_mac:
     timeout-minutes: 30
     strategy:
@@ -145,13 +33,8 @@ jobs:
       run: |
         python3 -m venv .venv
         brew install pkg-config assimp
-        # pip install trimesh
-#    - name: Install Java and Maven
-#      run: |
-#        brew install openjdk@21
-#        export PATH="/usr/local/opt/openjdk@21/bin:$PATH"
-#        brew install --ignore-dependencies maven
-#        echo "JAVA_HOME=$(/usr/libexec/java_home -v 21)" >> $GITHUB_ENV
+    - name: Install TBB
+      run: brew install tbb
     - name: Install Java and Maven
       run: |
         brew install openjdk@21
@@ -168,9 +51,7 @@ jobs:
     - uses: jwlawson/actions-setup-cmake@v1.12
     - name: Build
       run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=Release -DASSIMP_ENABLE=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .. && make
+        bash ./scripts/buildC.sh
       shell: bash
     - name: Find Libs
       run: |
@@ -239,10 +120,7 @@ jobs:
         restore-keys: ${{ runner.os }}-m2
     - name: Build C code
       run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=Release -DASSIMP_ENABLE=ON -DBUILD_SHARED_LIBS=ON -DMANIFOLD_DEBUG=ON -DMANIFOLD_EXPORT=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .. && make
-        cd ..
+        bash ./scripts/buildC.sh
     - name: Get version
       id: get_version
       run: echo "VERSION=$(cat bindings/java/version.txt)" >> $GITHUB_ENV
diff --git a/scripts/buildC.sh b/scripts/buildC.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+VERSION=$(cat ./bindings/java/version.txt)
+#rm -rf build
+mkdir build
+cd build
+set -e
+cmake -DCMAKE_BUILD_TYPE=Release -DASSIMP_ENABLE=ON -DBUILD_SHARED_LIBS=ON -DMANIFOLD_DEBUG=ON -DMANIFOLD_EXPORT=ON -DMANIFOLD_PAR=ON -DMANIFOLD_USE_BUILTIN_TBB=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..
+make
+cd ..
diff --git a/scripts/clojar.sh b/scripts/clojar.sh
@@ -14,6 +14,7 @@ VERSION=$(cat ./bindings/java/version.txt)
 linux_jar_file=./bindings/java/target/manifold3d-$VERSION.jar
 mv ./bindings/java/target/manifold3d-*-linux-x86_64.jar $linux_jar_file
 ls -la $linux_jar_file  # verify it exists before deploying
+set -e
 mvn deploy:deploy-file \
   -DpomFile=bindings/java/pom.xml \
   -DrepositoryId=clojars \
diff --git a/scripts/makeJars.sh b/scripts/makeJars.sh
@@ -1,13 +1,19 @@
 #!/bin/bash
 
-export JAVA_HOME=$HOME/bin/java21/
+echo "Java Home set to: "$JAVA_HOME
+printenv JAVA_HOME
+
+missing_vars=()
+[[ -z "${JAVA_HOME}" ]] && missing_vars+=("JAVA_HOME")
+
+if [[ ${#missing_vars[@]} -gt 0 ]]; then
+  echo "Error: The following required environment variables are not set: ${missing_vars[*]}"
+  exit 1
+fi
+
 VERSION=$(cat ./bindings/java/version.txt)
-#rm -rf build
-mkdir build
-cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DASSIMP_ENABLE=ON -DBUILD_SHARED_LIBS=ON -DMANIFOLD_DEBUG=ON -DMANIFOLD_EXPORT=ON -DMANIFOLD_PAR=NONE -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .. && make
-cd ..
-cd bindings/java
 
+cd bindings/java
+set -e
 mvn versions:set -DnewVersion=$(cat version.txt) --file pom.xml
 mvn package -Dos.classifier=linux-x86_64
