Skip to content

Commit 5c610ab

Browse files
committed
Attempt to fix the CI build for Windows
1 parent cf14b07 commit 5c610ab

1 file changed

Lines changed: 48 additions & 19 deletions

File tree

.github/workflows/build.yml

Lines changed: 48 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,13 @@ jobs:
3939

4040
steps:
4141
- name: Checkout
42-
uses: actions/checkout@v1
42+
uses: actions/checkout@v3
43+
44+
- name: Setup (Windows)
45+
if: matrix.config.os == 'windows-latest'
46+
uses: actions/setup-node@v2
47+
with:
48+
node-version: 16
4349

4450
- name: Install Dependencies (macOS)
4551
if: matrix.config.os == 'macos-latest'
@@ -56,22 +62,29 @@ jobs:
5662
5763
sudo apt-get install -y libcgal-dev libtbb-dev ninja-build qtbase5-dev
5864
59-
- name: Conda Cache (Windows)
60-
if: matrix.config.os == 'windows-latest'
61-
uses: actions/cache@v1
62-
with:
63-
path: C:\Miniconda3\envs\CCCoreLib
64-
key: conda-cache-${{ runner.os }}-${{ hashFiles('.ci/conda.yml') }}
65-
66-
- name: Install Dependencies (Windows)
67-
if: matrix.config.os == 'windows-latest'
68-
uses: conda-incubator/setup-miniconda@v2
69-
with:
70-
activate-environment: CCCoreLib
71-
auto-activate-base: false
72-
environment-file: .ci/conda.yml
73-
channels: conda-forge
74-
miniconda-version: 'latest'
65+
# DGM: caching conda doesn't seem to work properly anymore
66+
#- name: Conda Cache (Windows)
67+
# if: matrix.config.os == 'windows-latest'
68+
# uses: actions/cache@v3
69+
# with:
70+
# path: C:\Miniconda3\envs\CCCoreLib
71+
# key: conda-cache-${{ runner.os }}-${{ hashFiles('.ci/conda.yml') }}
72+
73+
# DGM: without caching, using conda takes too long...
74+
#- name: Install Dependencies (Windows)
75+
# if: matrix.config.os == 'windows-latest'
76+
# uses: conda-incubator/setup-miniconda@v2
77+
# with:
78+
# activate-environment: CCCoreLib
79+
# auto-activate-base: false
80+
# environment-file: .ci/conda.yml
81+
# channels: conda-forge
82+
# miniconda-version: 'latest'
83+
84+
# DGM: we'll just use Qt for now (and not CGAL)
85+
- name: Install Qt
86+
if: matrix.config.os == 'windows-latest'
87+
uses: jurplel/install-qt-action@v3
7588

7689
- name: Configure MSVC console (Windows)
7790
if: matrix.config.os == 'windows-latest'
@@ -98,8 +111,8 @@ jobs:
98111
-DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }}
99112
.
100113
101-
- name: Configure (Windows, Ubuntu)
102-
if: matrix.config.os != 'macos-latest'
114+
- name: Configure (Ubuntu)
115+
if: matrix.config.os == 'ubuntu-latest'
103116
run: >
104117
mkdir cccorelib-build
105118
@@ -112,6 +125,22 @@ jobs:
112125
-DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }}
113126
.
114127
128+
- name: Configure (Windows)
129+
if: matrix.config.os == 'windows-latest'
130+
run: >
131+
mkdir cccorelib-build
132+
133+
cmake
134+
-B cccorelib-build
135+
-G "${{ matrix.config.generator }}"
136+
-DCMAKE_BUILD_TYPE=Release
137+
# DGM: without caching, using conda takes tool long...
138+
#-DCCCORELIB_USE_CGAL=TRUE
139+
-DCCCORELIB_USE_CGAL=FALSE
140+
-DCCCORELIB_USES_TBB=TRUE
141+
-DCCCORELIB_SCALAR_DOUBLE=${{ matrix.scalar_double }}
142+
.
143+
115144
- name: Build
116145
run: |
117146
cmake --build cccorelib-build

0 commit comments

Comments
 (0)