Skip to content

Commit ac5a20e

Browse files
committed
Github actions: Use lz4 library in CI builds
1 parent 83af3ef commit ac5a20e

5 files changed

Lines changed: 21 additions & 7 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ runs:
1111
libboost-dev \
1212
libgdal-dev \
1313
libgeos++-dev \
14+
liblz4-dev \
1415
libproj-dev \
1516
libsparsehash-dev \
1617
ruby-json \

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ runs:
44
using: composite
55
steps:
66
- name: Install packages
7-
run: vcpkg install bzip2:x64-windows expat:x64-windows zlib:x64-windows boost-crc:x64-windows boost-variant:x64-windows sparsehash:x64-windows
7+
run: |
8+
vcpkg install \
9+
boost-crc:x64-windows \
10+
boost-variant:x64-windows \
11+
bzip2:x64-windows \
12+
expat:x64-windows \
13+
lz4:x64-windows \
14+
sparsehash:x64-windows \
15+
zlib:x64-windows
816
shell: bash
917

.github/workflows/ci.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ jobs:
134134
export APT_LISTCHANGES_FRONTEND=none
135135
export DEBIAN_FRONTEND=noninteractive
136136
apt-get update -qq
137-
apt-get install -y clang \
137+
apt-get install -y \
138+
clang \
138139
cmake \
139140
doxygen \
140141
g++ \
@@ -145,6 +146,7 @@ jobs:
145146
libexpat1-dev \
146147
libgdal-dev \
147148
libgeos++-dev \
149+
liblz4-dev \
148150
libproj-dev \
149151
libsparsehash-dev \
150152
make \
@@ -175,6 +177,7 @@ jobs:
175177
geos-devel \
176178
git \
177179
graphviz \
180+
lz4-devel \
178181
make \
179182
proj-devel \
180183
ruby \
@@ -236,6 +239,7 @@ jobs:
236239

237240
macos11-dev:
238241
runs-on: macos-11
242+
timeout-minutes: 40
239243
env:
240244
CC: clang
241245
CXX: clang++
@@ -269,7 +273,7 @@ jobs:
269273
- uses: ./.github/actions/build
270274
- uses: ./.github/actions/ctest
271275

272-
windows-minimal:
276+
windows-2019-minimal:
273277
runs-on: windows-2019
274278
timeout-minutes: 40
275279
steps:
@@ -282,7 +286,7 @@ jobs:
282286
- uses: ./.github/actions/build-windows
283287
- uses: ./.github/actions/ctest-windows
284288

285-
windows-full:
289+
windows-2019-full:
286290
runs-on: windows-2019
287291
steps:
288292
- uses: actions/checkout@v2
@@ -297,7 +301,7 @@ jobs:
297301
- uses: ./.github/actions/build-windows
298302
- uses: ./.github/actions/ctest-windows
299303

300-
windows-2020:
304+
windows-2022-minimal:
301305
runs-on: windows-2022
302306
timeout-minutes: 40
303307
steps:

.github/workflows/clang-tidy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
libexpat1-dev \
4242
libgdal-dev \
4343
libgeos++-dev \
44+
liblz4-dev \
4445
libproj-dev \
4546
libsparsehash-dev \
4647
make \

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ set(OSMIUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
170170
include_directories(${OSMIUM_INCLUDE_DIR})
171171

172172
if(WITH_PROJ)
173-
find_package(Osmium COMPONENTS io gdal geos proj)
173+
find_package(Osmium COMPONENTS lz4 io gdal geos proj)
174174
else()
175-
find_package(Osmium COMPONENTS io gdal geos)
175+
find_package(Osmium COMPONENTS lz4 io gdal geos)
176176
endif()
177177

178178
# The find_package put the directory where it found the libosmium includes

0 commit comments

Comments
 (0)