Attempt to fix the CI build for Windows

CloudCompare · Jan 22, 2023 · e9c3774 · e9c3774
1 parent cf14b07
commit e9c3774
Showing 1 changed file with 48 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,7 +39,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
+
+      - name: Setup (Windows)
+        if: matrix.config.os == 'windows-latest'
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
 
       - name: Install Dependencies (macOS)
         if: matrix.config.os == 'macos-latest'
@@ -56,22 +62,29 @@ jobs:
 
           sudo apt-get install -y libcgal-dev libtbb-dev ninja-build qtbase5-dev
 
-      - name: Conda Cache (Windows)
-        if: matrix.config.os == 'windows-latest'
-        uses: actions/cache@v1
-        with:
-          path: C:\Miniconda3\envs\CCCoreLib
-          key: conda-cache-${{ runner.os }}-${{ hashFiles('.ci/conda.yml') }}
-
-      - name: Install Dependencies (Windows)
-        if: matrix.config.os == 'windows-latest'
-        uses: conda-incubator/setup-miniconda@v2
-        with:
-          activate-environment: CCCoreLib
-          auto-activate-base: false
-          environment-file: .ci/conda.yml
-          channels: conda-forge
-          miniconda-version: 'latest'
+      # DGM: caching conda doesn't seem to work properly anymore
+      #- name: Conda Cache (Windows)
+      #  if: matrix.config.os == 'windows-latest'
+      #  uses: actions/cache@v3
+      #  with:
+      #    path: C:\Miniconda3\envs\CCCoreLib
+      #    key: conda-cache-${{ runner.os }}-${{ hashFiles('.ci/conda.yml') }}
+
+      # DGM: without caching, using conda takes too long...
+      #- name: Install Dependencies (Windows)
+      #  if: matrix.config.os == 'windows-latest'
+      #  uses: conda-incubator/setup-miniconda@v2
+      #  with:
+      #    activate-environment: CCCoreLib
+      #    auto-activate-base: false
+      #    environment-file: .ci/conda.yml
+      #    channels: conda-forge
+      #    miniconda-version: 'latest'
+
+      # DGM: we'll just use Qt for now (and not CGAL)
+      - name: Install Qt
+        if:  matrix.config.os == 'windows-latest'
+        uses: jurplel/install-qt-action@v3
 
       - name: Configure MSVC console (Windows)
         if:  matrix.config.os == 'windows-latest'
@@ -98,8 +111,8 @@ jobs:
           -DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }}
           .
 
-      - name: Configure (Windows, Ubuntu)
-        if: matrix.config.os != 'macos-latest'
+      - name: Configure (Ubuntu)
+        if: matrix.config.os == 'ubuntu-latest'
         run: >
           mkdir cccorelib-build
 
@@ -112,6 +125,22 @@ jobs:
           -DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }}
           .
 
+      - name: Configure (Windows)
+        if:  matrix.config.os == 'windows-latest'
+        run: >
+          mkdir cccorelib-build
+
+          cmake
+          -B cccorelib-build
+          -G "${{ matrix.config.generator }}"
+          -DCMAKE_BUILD_TYPE=Release
+          # DGM: without caching, using conda takes tool long...
+          #-DCCCORELIB_USE_CGAL=TRUE
+          -DCCCORELIB_USE_CGAL=FALSE
+          -DCCCORELIB_USES_TBB=TRUE
+          -DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }}
+          .
+
       - name: Build
         run: |
           cmake --build cccorelib-build