Skip to content

Commit 46ea605

Browse files
committed
Guthub action: Update config
1 parent d74f043 commit 46ea605

File tree

7 files changed

+40
-41
lines changed

7 files changed

+40
-41
lines changed

.github/actions/build/action.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
name: Build
22

33
runs:
4-
using: composite
5-
6-
steps:
7-
- name: Build
8-
run: make VERBOSE=1
9-
shell: bash
10-
working-directory: build
4+
using: composite
5+
steps:
6+
- name: Build
7+
run: make VERBOSE=1
8+
shell: bash
9+
working-directory: build
1110

.github/actions/cmake/action.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
name: CMake
22

33
runs:
4-
using: composite
4+
using: composite
5+
steps:
6+
- name: Create build directory
7+
run: mkdir build
8+
shell: bash
9+
- name: Configure
10+
run: |
11+
cmake -LA .. \
12+
-DCMAKE_BUILD_TYPE=${BUILD_TYPE}
13+
shell: bash
14+
working-directory: build
515

6-
steps:
7-
- name: Create build directory
8-
run: mkdir build
9-
shell: bash
10-
- name: Configure
11-
run: cmake -LA .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
12-
shell: bash
13-
working-directory: build

.github/actions/ctest/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: ctest
22

33
runs:
4-
using: composite
5-
steps:
6-
- name: Test
7-
run: ctest --output-on-failure
8-
shell: bash
9-
working-directory: build
4+
using: composite
5+
steps:
6+
- name: Test
7+
run: ctest --output-on-failure
8+
shell: bash
9+
working-directory: build
1010

.github/actions/install-from-git/action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Install Prerequisites from git
22

33
runs:
44
using: composite
5-
65
steps:
76
- name: Install from git
87
run: |

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Install Prerequisites on macOS
22

33
runs:
44
using: composite
5-
65
steps:
76
- name: Install homebrew packages
87
run: |

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ name: Install Prerequisites on Ubuntu
22

33
runs:
44
using: composite
5-
65
steps:
76
- name: Install packages
87
run: |
9-
sudo apt-get update -q
8+
sudo apt-get update -qq
109
sudo apt-get install -yq \
11-
libgdal-dev \
12-
libgeos-dev \
13-
pandoc \
14-
spatialite-bin
10+
libgdal-dev \
11+
libgeos-dev \
12+
pandoc \
13+
spatialite-bin
1514
shell: bash
1615
- name: Install from git
1716
run: |

.github/workflows/ci.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ jobs:
129129
- name: Prepare container (apt)
130130
run: |
131131
apt-get update -qq
132-
apt-get install -y clang \
132+
apt-get install -yq \
133+
clang \
133134
cmake \
134135
g++ \
135136
git \
@@ -145,7 +146,7 @@ jobs:
145146
if: matrix.installer == 'apt'
146147
- name: Install compiler
147148
shell: bash
148-
run: apt-get install -y clang-14
149+
run: apt-get install -yq clang-14
149150
if: matrix.cpp_compiler == 'clang++-14'
150151
- name: Prepare container (dnf)
151152
run: |
@@ -171,18 +172,18 @@ jobs:
171172
- uses: ./.github/actions/ctest
172173

173174
ubuntu-latest:
174-
runs-on: ubuntu-20.04
175+
runs-on: ubuntu-22.04
175176
env:
176-
CC: clang-13
177-
CXX: clang++-13
177+
CC: clang-15
178+
CXX: clang++-15
178179
BUILD_TYPE: Dev
179180
steps:
180181
- name: Install new clang
181182
run: |
182-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
183-
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main'
184-
sudo apt-get update -q
185-
sudo apt-get install -yq clang-13
183+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.asc
184+
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main'
185+
sudo apt-get update -qq
186+
sudo apt-get install -yq clang-15
186187
shell: bash
187188
- uses: actions/checkout@v3
188189
- uses: ./.github/actions/install-ubuntu
@@ -191,7 +192,7 @@ jobs:
191192
- uses: ./.github/actions/ctest
192193

193194
macos11-dev:
194-
runs-on: macos-11.0
195+
runs-on: macos-11
195196
env:
196197
CC: clang
197198
CXX: clang++
@@ -204,7 +205,7 @@ jobs:
204205
- uses: ./.github/actions/ctest
205206

206207
macos11-release:
207-
runs-on: macos-11.0
208+
runs-on: macos-11
208209
env:
209210
CC: clang
210211
CXX: clang++

0 commit comments

Comments
 (0)