Skip to content

Commit 2adf892

Browse files
committed
Github actions: Update config
1 parent 146cc02 commit 2adf892

File tree

4 files changed

+35
-33
lines changed

4 files changed

+35
-33
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ runs:
77
run: mkdir build
88
shell: bash
99
- name: Configure
10-
run: cmake -LA .. -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DBUILD_HEADERS=OFF -DBUILD_BENCHMARKS=ON -DOsmium_DEBUG=TRUE -DPROTOZERO_INCLUDE_DIR=${GITHUB_WORKSPACE}/../protozero/include
10+
run: |
11+
cmake -LA .. \
12+
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \
13+
-DBUILD_HEADERS=OFF \
14+
-DBUILD_BENCHMARKS=ON \
15+
-DOsmium_DEBUG=TRUE \
16+
-DPROTOZERO_INCLUDE_DIR=${GITHUB_WORKSPACE}/../protozero/include
1117
shell: bash
1218
working-directory: build
1319

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
steps:
66
- name: Install packages
77
run: |
8-
sudo apt-get update -q
8+
sudo apt-get update -qq
99
sudo apt-get install -yq \
1010
doxygen \
1111
libboost-dev \

.github/workflows/ci.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@ jobs:
128128
CXX: ${{ matrix.cpp_compiler }}
129129
CPP_VERSION: ${{ matrix.cpp_version }}
130130
WITH_PROJ: ON
131+
APT_LISTCHANGES_FRONTEND: none
132+
DEBIAN_FRONTEND: noninteractive
131133
steps:
132134
- name: Prepare container (apt)
133135
run: |
134-
export APT_LISTCHANGES_FRONTEND=none
135-
export DEBIAN_FRONTEND=noninteractive
136136
apt-get update -qq
137-
apt-get install -y \
137+
apt-get install -yq \
138138
clang \
139139
cmake \
140140
doxygen \
@@ -158,10 +158,7 @@ jobs:
158158
if: matrix.installer == 'apt'
159159
- name: Install compiler
160160
shell: bash
161-
run: |
162-
export APT_LISTCHANGES_FRONTEND=none
163-
export DEBIAN_FRONTEND=noninteractive
164-
apt-get install -y clang-14
161+
run: apt-get install -yq clang-14
165162
if: matrix.cpp_compiler == 'clang++-14'
166163
- name: Prepare container (dnf)
167164
run: |
@@ -187,7 +184,7 @@ jobs:
187184
zlib-devel
188185
shell: bash
189186
if: matrix.installer == 'dnf'
190-
# Use v1 of checkout because v2 doesn't work with submodules
187+
# Use v1 of checkout because v3 doesn't work with submodules
191188
- uses: actions/checkout@v1
192189
with:
193190
submodules: true
@@ -212,8 +209,8 @@ jobs:
212209
run: |
213210
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.asc
214211
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main'
215-
sudo apt-get update -q
216-
sudo apt-get install clang-15
212+
sudo apt-get update -qq
213+
sudo apt-get install -yq clang-15
217214
shell: bash
218215
- uses: ./.github/actions/install-ubuntu
219216
- uses: ./.github/actions/install-protozero

.github/workflows/clang-tidy.yml

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: clang-tidy
33
on: workflow_dispatch
44

55
jobs:
6-
76
clang-tidy:
87
runs-on: ubuntu-latest
98
strategy:
@@ -14,9 +13,9 @@ jobs:
1413
- image: "debian:bullseye"
1514
clang: 11
1615
- image: "debian:testing"
17-
clang: 12
16+
clang: 15
1817
- image: "debian:experimental"
19-
clang: 14
18+
clang: 15
2019
container:
2120
image: ${{ matrix.image }}
2221
env:
@@ -25,29 +24,29 @@ jobs:
2524
CXX: clang++-${{ matrix.clang }}
2625
CPP_VERSION: c++11
2726
WITH_PROJ: ON
27+
APT_LISTCHANGES_FRONTEND: none
28+
DEBIAN_FRONTEND: noninteractive
2829
steps:
2930
- name: Prepare container (apt)
3031
run: |
31-
export APT_LISTCHANGES_FRONTEND=none
32-
export DEBIAN_FRONTEND=noninteractive
3332
apt-get update -qq
34-
apt-get install -y \
35-
clang-${{ matrix.clang }} \
36-
clang-tidy-${{ matrix.clang }} \
37-
cmake \
38-
git \
39-
libboost-dev \
40-
libbz2-dev \
41-
libexpat1-dev \
42-
libgdal-dev \
43-
libgeos++-dev \
44-
liblz4-dev \
45-
libproj-dev \
46-
libsparsehash-dev \
47-
make \
48-
zlib1g-dev
33+
apt-get install -yq \
34+
clang-${{ matrix.clang }} \
35+
clang-tidy-${{ matrix.clang }} \
36+
cmake \
37+
git \
38+
libboost-dev \
39+
libbz2-dev \
40+
libexpat1-dev \
41+
libgdal-dev \
42+
libgeos++-dev \
43+
liblz4-dev \
44+
libproj-dev \
45+
libsparsehash-dev \
46+
make \
47+
zlib1g-dev
4948
shell: bash
50-
# Use v1 of checkout because v2 doesn't work with submodules
49+
# Use v1 of checkout because v3 doesn't work with submodules
5150
- uses: actions/checkout@v1
5251
with:
5352
submodules: true

0 commit comments

Comments
 (0)