Skip to content

Commit 729e5f6

Browse files
committed
More typo fixes and compiler corrections
This is not going too smoothly :D I'm also being caught out by the fact that my local machine has the latest compilers but the docker images are a bit older so using their default versions often trips us up.
1 parent a8d350e commit 729e5f6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ jobs:
7272
docker:
7373
- image: cimg/base:current
7474
steps:
75-
- run: sudo apt update && sudo apt install -y git cmake ninja-build clang llvm
75+
- run: sudo apt update && sudo apt install -y git cmake ninja-build clang-15 llvm
7676
- full_checkout
77-
- run: cmake -GNinja -H. -B../Debug-build -DINCH_UNIT_TESTS=ON -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_BUILD_TYPE=Debug
77+
- run: cmake -GNinja -H. -B../Debug-build -DINCH_UNIT_TESTS=ON -DCMAKE_CXX_COMPILER=/usr/bin/clang++-15 -DCMAKE_BUILD_TYPE=Debug
7878
- build_and_test:
7979
dir: ../Debug-build
8080

8181
build_clang_release:
8282
docker:
8383
- image: cimg/base:current
8484
steps:
85-
- run: sudo apt update && sudo apt install -y git cmake ninja-build clang llvm
85+
- run: sudo apt update && sudo apt install -y git cmake ninja-build clang-15 llvm
8686
- full_checkout
87-
- run: cmake -GNinja -H. -B../Release-build -DINCH_UNIT_TESTS=ON -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_BUILD_TYPE=Release
87+
- run: cmake -GNinja -H. -B../Release-build -DINCH_UNIT_TESTS=ON -DCMAKE_CXX_COMPILER=/usr/bin/clang++-15 -DCMAKE_BUILD_TYPE=Release
8888
- build_and_test:
8989
dir: ../Release-build
9090

.github/workflows/cmake_build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
compiler: [clang++, g++]
22+
compiler: [clang++-15, g++]
2323
type: [Debug, Release]
2424

2525
steps:
@@ -28,10 +28,10 @@ jobs:
2828
submodules: true
2929

3030
- name: Install dependencies
31-
run: sudo apt update && sudo apt install -y cmake ninja-build clang gcc g++ clang
31+
run: sudo apt update && sudo apt install -y cmake ninja-build gcc g++ clang-15
3232

3333
- name: Configure
34-
run: cmake -GNinja -H. -B../Build -DINCH_UNITS_TEST=ON -DCMAKE_CXX_COMPILER=/usr/bin/${{ matrix.compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.type }}
34+
run: cmake -GNinja -H. -B../Build -DINCH_UNIT_TESTS=ON -DCMAKE_CXX_COMPILER=/usr/bin/${{ matrix.compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.type }}
3535

3636
- name: Build
3737
run: cmake --build ../Build

0 commit comments

Comments
 (0)