Skip to content

Commit 4160d23

Browse files
jotojoto
committed
Update CI workflow
1 parent 6318f51 commit 4160d23

File tree

8 files changed

+104
-47
lines changed

8 files changed

+104
-47
lines changed

‎.github/actions/build-windows/action.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Build
2+
3+
runs:
4+
using: composite
5+
6+
steps:
7+
- name: Build
8+
run: cmake --build . --config ${BUILD_TYPE}
9+
shell: bash
10+
working-directory: build
11+

‎.github/actions/build/action.yml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@ runs:
44
using: composite
55

66
steps:
7-
- name: Create build directory
8-
run: mkdir build
9-
shell: bash
10-
11-
- name: Configure
12-
run: |
13-
cmake -LA .. \
14-
-DBUILD_DATA_TESTS=ON \
15-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
16-
-DPROTOZERO_INCLUDE_DIR=${GITHUB_WORKSPACE}/../protozero/include
17-
shell: bash
18-
working-directory: build
19-
207
- name: Build
218
run: make VERBOSE=1
229
shell: bash

‎.github/actions/cmake-windows/action.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Build
2+
3+
runs:
4+
using: composite
5+
6+
steps:
7+
- name: Configure
8+
run: |
9+
mkdir build
10+
cd build
11+
BOOST_ROOT=$BOOST_ROOT_1_72_0 cmake -LA .. \
12+
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \
13+
-DBUILD_HEADERS=OFF \
14+
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
15+
-DPROTOZERO_INCLUDE_DIR=${GITHUB_WORKSPACE}/../protozero/include
16+
shell: bash
17+

‎.github/actions/cmake/action.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Build
2+
3+
runs:
4+
using: composite
5+
6+
steps:
7+
- name: Configure
8+
run: |
9+
mkdir build
10+
cd build
11+
cmake -LA .. \
12+
-DBUILD_DATA_TESTS=ON \
13+
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
14+
-DPROTOZERO_INCLUDE_DIR=${GITHUB_WORKSPACE}/../protozero/include
15+
shell: bash
16+

‎.github/actions/ctest-windows/action.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: ctest
2+
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Test
7+
run: ctest --output-on-failure -C ${BUILD_TYPE}
8+
shell: bash
9+
working-directory: build
10+

‎.github/actions/install-ubuntu/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ runs:
99
sudo apt-get update -q
1010
sudo apt-get install -yq \
1111
doxygen \
12-
libboost-all-dev \
12+
libboost-dev \
1313
libgdal-dev \
1414
libgeos++-dev \
1515
libproj-dev \

‎.github/actions/install-windows/action.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Install Prerequisites on Windows
2+
3+
runs:
4+
using: composite
5+
6+
steps:
7+
- name: Install packages
8+
run: |
9+
vcpkg install \
10+
bzip2:x64-windows \
11+
expat:x64-windows \
12+
gdal:x64-windows \
13+
geos:x64-windows \
14+
proj:x64-windows \
15+
sparsehash:x64-windows \
16+
zlib:x64-windows
17+
shell: bash
18+
- name: Install from git
19+
run: |
20+
git clone --quiet --depth 1 https://github.com/mapbox/protozero.git ../protozero
21+
shell: bash
22+

‎.github/workflows/ci.yml‎

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
with:
1515
submodules: true
1616
- uses: ./.github/actions/install-ubuntu
17+
- uses: ./.github/actions/cmake
1718
- uses: ./.github/actions/build
1819
- uses: ./.github/actions/ctest
1920

@@ -28,6 +29,7 @@ jobs:
2829
with:
2930
submodules: true
3031
- uses: ./.github/actions/install-ubuntu
32+
- uses: ./.github/actions/cmake
3133
- uses: ./.github/actions/build
3234
- uses: ./.github/actions/ctest
3335

@@ -42,6 +44,7 @@ jobs:
4244
with:
4345
submodules: true
4446
- uses: ./.github/actions/install-ubuntu
47+
- uses: ./.github/actions/cmake
4548
- uses: ./.github/actions/build
4649
- uses: ./.github/actions/ctest
4750

@@ -56,6 +59,7 @@ jobs:
5659
with:
5760
submodules: true
5861
- uses: ./.github/actions/install-ubuntu
62+
- uses: ./.github/actions/cmake
5963
- uses: ./.github/actions/build
6064
- uses: ./.github/actions/ctest
6165

@@ -70,6 +74,7 @@ jobs:
7074
with:
7175
submodules: true
7276
- uses: ./.github/actions/install-ubuntu
77+
- uses: ./.github/actions/cmake
7378
- uses: ./.github/actions/build
7479
- uses: ./.github/actions/ctest
7580

@@ -86,6 +91,7 @@ jobs:
8691
with:
8792
submodules: true
8893
- uses: ./.github/actions/install-ubuntu
94+
- uses: ./.github/actions/cmake
8995
- uses: ./.github/actions/build
9096
- uses: ./.github/actions/ctest
9197

@@ -100,6 +106,7 @@ jobs:
100106
with:
101107
submodules: true
102108
- uses: ./.github/actions/install-ubuntu
109+
- uses: ./.github/actions/cmake
103110
- uses: ./.github/actions/build
104111
- uses: ./.github/actions/ctest
105112

@@ -114,6 +121,7 @@ jobs:
114121
with:
115122
submodules: true
116123
- uses: ./.github/actions/install-ubuntu
124+
- uses: ./.github/actions/cmake
117125
- uses: ./.github/actions/build
118126
- uses: ./.github/actions/ctest
119127

@@ -128,6 +136,7 @@ jobs:
128136
with:
129137
submodules: true
130138
- uses: ./.github/actions/install-ubuntu
139+
- uses: ./.github/actions/cmake
131140
- uses: ./.github/actions/build
132141
- uses: ./.github/actions/ctest
133142

@@ -142,6 +151,7 @@ jobs:
142151
with:
143152
submodules: true
144153
- uses: ./.github/actions/install-ubuntu
154+
- uses: ./.github/actions/cmake
145155
- uses: ./.github/actions/build
146156
- uses: ./.github/actions/ctest
147157

@@ -157,6 +167,7 @@ jobs:
157167
with:
158168
submodules: true
159169
- uses: ./.github/actions/install-ubuntu
170+
- uses: ./.github/actions/cmake
160171
- uses: ./.github/actions/build
161172
- uses: ./.github/actions/ctest
162173
- name: Coverage
@@ -182,6 +193,7 @@ jobs:
182193
with:
183194
submodules: true
184195
- uses: ./.github/actions/install-ubuntu
196+
- uses: ./.github/actions/cmake
185197
- uses: ./.github/actions/build
186198
- uses: ./.github/actions/ctest
187199

@@ -196,6 +208,7 @@ jobs:
196208
with:
197209
submodules: true
198210
- uses: ./.github/actions/install-macos
211+
- uses: ./.github/actions/cmake
199212
- uses: ./.github/actions/build
200213
- uses: ./.github/actions/ctest
201214

@@ -210,6 +223,7 @@ jobs:
210223
with:
211224
submodules: true
212225
- uses: ./.github/actions/install-macos
226+
- uses: ./.github/actions/cmake
213227
- uses: ./.github/actions/build
214228
- uses: ./.github/actions/ctest
215229

@@ -224,40 +238,20 @@ jobs:
224238
with:
225239
submodules: true
226240
- uses: ./.github/actions/install-macos
241+
- uses: ./.github/actions/cmake
227242
- uses: ./.github/actions/build
228243
- uses: ./.github/actions/ctest
229244

230-
# does not work yet
231-
# windows-msys2:
232-
# runs-on: windows-2019
233-
# defaults:
234-
# run:
235-
# shell: msys2 {0}
236-
# env:
237-
# PROJ_LIB: c:\msys64\mingw64\share\proj
238-
# steps:
239-
# - uses: actions/checkout@v2
240-
# with:
241-
# submodules: true
242-
# - uses: msys2/setup-msys2@v2
243-
# with:
244-
# msystem: MINGW64
245-
# update: true
246-
# install: git mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gcc mingw-w64-x86_64-geos mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-cppcheck mingw-w64-x86_64-doxygen mingw-w64-x86_64-gdb mingw-w64-x86_64-sparsehash mingw-w64-x86_64-gdal mingw-w64-x86_64-ruby mingw-w64-x86_64-libspatialite mingw-w64-x86_64-spatialite-tools mingw-w64-x86_64-clang-tools-extra
247-
# - name: Install Protozero...
248-
# run: |
249-
# echo $PATH
250-
# cd ..
251-
# git clone --depth 1 https://github.com/mapbox/protozero
252-
# gem.cmd install json
253-
# - name: CI-Build
254-
# run: |
255-
# mkdir build
256-
# cd build
257-
# cmake -LA .. \
258-
# -DBUILD_DATA_TESTS=ON \
259-
# -DBUILD_HEADERS=OFF \
260-
# -DPROTOZERO_INCLUDE_DIR=${GITHUB_WORKSPACE}/../protozero/include
261-
# make
262-
# - uses: ./.github/actions/ctest
245+
windows:
246+
runs-on: windows-2019
247+
env:
248+
BUILD_TYPE: Dev
249+
steps:
250+
- uses: actions/checkout@v2
251+
with:
252+
submodules: true
253+
- uses: ./.github/actions/install-windows
254+
- uses: ./.github/actions/cmake-windows
255+
- uses: ./.github/actions/build-windows
256+
- uses: ./.github/actions/ctest-windows
263257

0 commit comments

Comments
 (0)