Skip to content

Commit 146cc02

Browse files
committed
Github action: Update config
1 parent 4e6ab37 commit 146cc02

2 files changed

Lines changed: 13 additions & 33 deletions

File tree

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@ runs:
1616
libsparsehash-dev \
1717
ruby-json \
1818
spatialite-bin
19-
test "$CC" = clang-6.0 && sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-6.0
20-
test "$CC" = clang-8 && sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-8
21-
test "$CC" = clang-13 && sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-13
2219
shell: bash
2320

.github/workflows/ci.yml

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: CI
33
on: [ push, pull_request ]
44

55
jobs:
6-
76
linux:
87
runs-on: ubuntu-latest
98
timeout-minutes: 40
@@ -198,46 +197,30 @@ jobs:
198197
- uses: ./.github/actions/ctest
199198

200199
ubuntu-latest:
201-
runs-on: ubuntu-20.04
200+
runs-on: ubuntu-22.04
202201
timeout-minutes: 40
203202
env:
204-
CC: clang-13
205-
CXX: clang++-13
203+
CC: clang-15
204+
CXX: clang++-15
206205
BUILD_TYPE: Dev
207206
WITH_PROJ: ON
208207
steps:
209-
- uses: actions/checkout@v2
208+
- uses: actions/checkout@v3
210209
with:
211210
submodules: true
212211
- name: Install new clang
213212
run: |
214-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
215-
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main'
213+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.asc
214+
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
216217
shell: bash
217218
- uses: ./.github/actions/install-ubuntu
218219
- uses: ./.github/actions/install-protozero
219220
- uses: ./.github/actions/cmake
220221
- uses: ./.github/actions/build
221222
- uses: ./.github/actions/ctest
222223

223-
macos10-dev:
224-
runs-on: macos-10.15
225-
timeout-minutes: 60
226-
env:
227-
CC: clang
228-
CXX: clang++
229-
BUILD_TYPE: Dev
230-
WITH_PROJ: OFF
231-
steps:
232-
- uses: actions/checkout@v2
233-
with:
234-
submodules: true
235-
- uses: ./.github/actions/install-macos
236-
- uses: ./.github/actions/install-protozero
237-
- uses: ./.github/actions/cmake
238-
- uses: ./.github/actions/build
239-
- uses: ./.github/actions/ctest
240-
241224
macos11-dev:
242225
runs-on: macos-11
243226
timeout-minutes: 60
@@ -247,7 +230,7 @@ jobs:
247230
BUILD_TYPE: Dev
248231
WITH_PROJ: OFF
249232
steps:
250-
- uses: actions/checkout@v2
233+
- uses: actions/checkout@v3
251234
with:
252235
submodules: true
253236
- uses: ./.github/actions/install-macos
@@ -265,7 +248,7 @@ jobs:
265248
BUILD_TYPE: Release
266249
WITH_PROJ: OFF
267250
steps:
268-
- uses: actions/checkout@v2
251+
- uses: actions/checkout@v3
269252
with:
270253
submodules: true
271254
- uses: ./.github/actions/install-macos
@@ -278,7 +261,7 @@ jobs:
278261
runs-on: windows-2019
279262
timeout-minutes: 40
280263
steps:
281-
- uses: actions/checkout@v2
264+
- uses: actions/checkout@v3
282265
with:
283266
submodules: true
284267
- uses: ./.github/actions/install-windows
@@ -290,7 +273,7 @@ jobs:
290273
windows-2019-full:
291274
runs-on: windows-2019
292275
steps:
293-
- uses: actions/checkout@v2
276+
- uses: actions/checkout@v3
294277
with:
295278
submodules: true
296279
- uses: ./.github/actions/install-windows
@@ -306,7 +289,7 @@ jobs:
306289
runs-on: windows-2022
307290
timeout-minutes: 40
308291
steps:
309-
- uses: actions/checkout@v2
292+
- uses: actions/checkout@v3
310293
with:
311294
submodules: true
312295
- uses: ./.github/actions/install-windows

0 commit comments

Comments
 (0)