Merge pull request #13 from jorgensd/dokken/update-cmake

Dokken/update cmake
wildmeshing · Dec 16, 2024 · bc83507 · bc83507
2 parents f5f58ff + de49d07
commit bc83507
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml
@@ -12,25 +12,29 @@ env:
   CTEST_OUTPUT_ON_FAILURE: ON
   CTEST_PARALLEL_LEVEL: 2
 
+defaults:
+  run:
+    shell: bash -el {0}
+
 jobs:
   Build:
     name: ${{ matrix.name }} (${{ matrix.config }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, macos-latest, windows-2019]
+        os: [ubuntu-22.04, macOS-13, windows-2019]
         config: [Debug, Release]
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-22.04
             name: Linux
           - os: windows-2019
             name: Windows
-          - os: macos-latest
+          - os: macos-13
             name: macOS
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
         with:
           fetch-depth: 10
           submodules: "recursive"
@@ -39,14 +43,16 @@ jobs:
         if: runner.os == 'Windows'
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Stetup Conda
-        uses: s-weigand/setup-conda@v1
+      - name: Setup Conda
+        uses: conda-incubator/setup-miniconda@v3
         with:
-          conda-channels: anaconda, conda-forge
-          python-version: 3.6
+          channels: conda-forge
+          python-version: 3.7
+          channel-priority: true
+          activate-environment: test-env
 
       - name: Install Dependencies
-        run: conda install numpy svgwrite -y
+        run: conda install numpy svgwrite cmake git -y
 
       - name: Install Dependencies  (Windows)
         if: runner.os == 'Windows'
@@ -56,9 +62,13 @@ jobs:
         if: runner.os == 'Windows'
         run: echo "CMAKE_GENERATOR=NMake Makefiles" >> $GITHUB_ENV
 
+      - name: Configure git
+        run: git config --global http.version HTTP/1.1
+
       - name: Build (Debug)
         if: matrix.config == 'Debug'
-        run: python setup.py build --debug install
+        run: |
+          python setup.py build --debug install
 
       - name: Build (Release)
         if: matrix.config == 'Release'

diff --git a/cmake/WildMeshingDownloadExternal.cmake b/cmake/WildMeshingDownloadExternal.cmake
@@ -23,11 +23,10 @@ endfunction()
 
 ################################################################################
 
-
 function(wildmeshing_download_triwild)
     wildmeshing_download_project(triwild
         GIT_REPOSITORY  https://github.com/wildmeshing/TriWild
-        GIT_TAG         8e9e5ea25b11b346ddb8db8746174153259807d4
+        GIT_TAG         ac7977c1da9fb25de8c0f7c666055e6d09034686
     )
 endfunction()
 
@@ -41,14 +40,14 @@ endfunction()
 function(wildmeshing_download_pybind11)
     wildmeshing_download_project(pybind11
         GIT_REPOSITORY https://github.com/pybind/pybind11
-        GIT_TAG        085a29436a8c472caaaf7157aa644b571079bcaa
+        GIT_TAG        a2e59f0e7065404b44dfe92a28aca47ba1378dc4
     )
 endfunction()
 
 # data
 function(wildmeshing_download_data)
     wildmeshing_download_project(data
         GIT_REPOSITORY https://github.com/wildmeshing/data
-        GIT_TAG        1484054abbac36e9c8340c3b32d87ad6eee45016
+        GIT_TAG        363f8e860673a4e4f68df6465b99e86809c96283
     )
 endfunction()