Skip to content

Commit a3ef228

Browse files
committed
Always specify compiler versions and use fewer jobs on CircleCI
1 parent 31f6cb1 commit a3ef228

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.circleci/config.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -304,46 +304,46 @@ workflows:
304304
- build:
305305
version: default
306306
name: old-petsc
307-
cc: clang
308-
cxx: clang++
307+
cc: clang-18
308+
cxx: clang++-18
309309
cmake_prefix: /usr
310310
petsc_dir: /home/builder/local/petsc-3.7.0
311311
python: "No"
312312

313313
- build:
314314
version: default
315315
name: petsc-64bit
316-
cc: clang
317-
cxx: clang++
316+
cc: clang-18
317+
cxx: clang++-18
318318
cmake_prefix: /usr
319319
petsc_dir: /home/builder/local/petsc-64bit
320320
python: "Yes"
321321

322322
- build:
323323
version: default
324324
name: old-cmake
325-
cc: clang
326-
cxx: clang++
325+
cc: clang-18
326+
cxx: clang++-18
327327
cmake_prefix: /home/builder/local/cmake-3.16.0
328328
petsc_dir: /home/builder/local/petsc
329329
python: "Yes"
330330

331331
- build-minimal:
332332
name: gcc-minimal
333-
cc: gcc
334-
cxx: g++
333+
cc: gcc-14
334+
cxx: g++-14
335335
cmake_prefix: /usr
336336

337337
- build-minimal:
338338
name: clang-minimal
339-
cc: clang
340-
cxx: clang++
339+
cc: clang-18
340+
cxx: clang++-18
341341
cmake_prefix: /usr
342342

343343
- build-minimal:
344344
name: old-cmake-minimal
345-
cc: clang
346-
cxx: clang++
345+
cc: clang-18
346+
cxx: clang++-18
347347
cmake_prefix: /home/builder/local/cmake-3.16.0
348348

349349
- manual-html

docker/ubuntu-ci/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -u
77
# Uses environment variables CC and CXX to select the compiler
88

99
# Compile using this many jobs
10-
N=${N:-8}
10+
N=${N:-4}
1111

1212
# CMake installation prefix
1313
cmake_prefix=${cmake_prefix:-/usr}

0 commit comments

Comments
 (0)