@@ -207,13 +207,12 @@ install_macos_prerequisites_template: &INSTALL_MACOS_PREREQUISITES_TEMPLATE
207
207
mkdir ninja
208
208
tar -xf ninja-mac.zip -C ninja
209
209
rm ninja-mac.zip
210
- # Download & extract LDC-flavoured LLVM (no withAsserts package available for arm64 yet)
211
- assertsSuffix=""
212
- if [[ "$CI_ARCH" == "x86_64" ]]; then
213
- echo 'Using LLVM with enabled assertions'
214
- assertsSuffix="-withAsserts"
215
- fi
216
- curl -fL --retry 3 --max-time 300 -o llvm.tar.xz https://github.com/ldc-developers/llvm-project/releases/download/ldc-v$LLVM_VERSION/llvm-$LLVM_VERSION-osx-${CI_ARCH}${assertsSuffix}.tar.xz
210
+ # Download & extract LDC-flavoured LLVM
211
+ echo 'Using LLVM with enabled assertions'
212
+ assertsSuffix="-withAsserts"
213
+ llvm_tag="CI"
214
+ if [[ "$LLVM_VERSION" == *.* ]]; then llvm_tag="ldc-v$LLVM_VERSION"; fi
215
+ curl -fL --retry 3 --max-time 300 -o llvm.tar.xz https://github.com/ldc-developers/llvm-project/releases/download/$llvm_tag/llvm-$LLVM_VERSION-osx-${CI_ARCH}${assertsSuffix}.tar.xz
217
216
mkdir llvm
218
217
tar -xf llvm.tar.xz --strip 1 -C llvm
219
218
rm llvm.tar.xz
@@ -228,7 +227,8 @@ install_macos_prerequisites_template: &INSTALL_MACOS_PREREQUISITES_TEMPLATE
228
227
229
228
environment :
230
229
CIRRUS_CLONE_DEPTH : 50
231
- HOST_LDC_VERSION : 1.24.0
230
+ HOST_LDC_VERSION : 1.31.0
231
+ LLVM_VERSION : 15.0.7
232
232
GITHUB_TOKEN : ENCRYPTED[0955bd48c8d4e5391446fc0149d0719ad0b63df27ec9e6c180a5730a5b10dc7f28f09d1383423db158d21380ee2b022a]
233
233
234
234
task :
@@ -289,30 +289,26 @@ task:
289
289
allow_failures : true # FIXME
290
290
macos_instance :
291
291
image : ghcr.io/cirruslabs/macos-monterey-xcode:latest
292
- timeout_in : 15m
292
+ timeout_in : 25m
293
293
environment :
294
294
CI_OS : osx
295
- LLVM_VERSION : 14.0.3
296
295
# OS is preset to `darwin`
297
296
OS : osx
298
297
PATH : ${CIRRUS_WORKING_DIR}/../cmake/bin:${CIRRUS_WORKING_DIR}/../ninja:${CIRRUS_WORKING_DIR}/../llvm/bin:${PATH}
299
298
PARALLELISM : 4
300
299
matrix :
301
300
# - TASK_NAME_SUFFIX: x64 (M1)
302
- # EXTRA_CMAKE_FLAGS: " -DCMAKE_OSX_ARCHITECTURES=x86_64 -DD_COMPILER_FLAGS=-gcc=/usr/bin/c++ -DBUILD_LTO_LIBS=ON"
301
+ # EXTRA_CMAKE_FLAGS: -DCMAKE_OSX_ARCHITECTURES=x86_64 -DD_COMPILER_FLAGS=-gcc=/usr/bin/c++ -DBUILD_LTO_LIBS=ON
303
302
# CI_ARCH: x86_64
304
303
# - TASK_NAME_SUFFIX: x64 (M1) shared-libs-only
305
- # EXTRA_CMAKE_FLAGS: " -DCMAKE_OSX_ARCHITECTURES=x86_64 -DD_COMPILER_FLAGS=-gcc=/usr/bin/c++ -DBUILD_LTO_LIBS=ON -DBUILD_SHARED_LIBS=ON"
304
+ # EXTRA_CMAKE_FLAGS: -DCMAKE_OSX_ARCHITECTURES=x86_64 -DD_COMPILER_FLAGS=-gcc=/usr/bin/c++ -DBUILD_LTO_LIBS=ON -DBUILD_SHARED_LIBS=ON
306
305
# CI_ARCH: x86_64
307
306
- TASK_NAME_SUFFIX : arm64
308
- # no line infos for ldc2 unittests (compiled with -g with v1.30 host compiler - https://github.com/ldc-developers/ldc/issues/3864)
309
- EXTRA_CMAKE_FLAGS : " -DDFLAGS_LDC=-preserve-dwarf-line-section=false -DD_COMPILER_FLAGS=-gcc=/usr/bin/c++ -DBUILD_LTO_LIBS=ON"
307
+ EXTRA_CMAKE_FLAGS : -DD_COMPILER_FLAGS=-gcc=/usr/bin/c++ -DBUILD_LTO_LIBS=ON
310
308
CI_ARCH : arm64
311
- HOST_LDC_VERSION : 1.30.0
312
309
- TASK_NAME_SUFFIX : arm64 shared-libs-only
313
- EXTRA_CMAKE_FLAGS : " -DDFLAGS_LDC=-preserve-dwarf-line-section=false - DD_COMPILER_FLAGS=-gcc=/usr/bin/c++ -DBUILD_LTO_LIBS=ON -DBUILD_SHARED_LIBS=ON"
310
+ EXTRA_CMAKE_FLAGS : - DD_COMPILER_FLAGS=-gcc=/usr/bin/c++ -DBUILD_LTO_LIBS=ON -DBUILD_SHARED_LIBS=ON
314
311
CI_ARCH : arm64
315
- HOST_LDC_VERSION : 1.30.0
316
312
brew_cache :
317
313
folder : " $HOME/Library/Caches/Homebrew"
318
314
<< : *INSTALL_MACOS_PREREQUISITES_TEMPLATE
@@ -339,8 +335,7 @@ task:
339
335
-DLLVM_ROOT_DIR=$CIRRUS_WORKING_DIR/../llvm
340
336
-DD_COMPILER=$CIRRUS_WORKING_DIR/../bootstrap-ldc/bin/ldmd2
341
337
PARALLELISM : 4
342
- LLVM_VERSION : 14.0.3
343
- CLANG_VERSION : 14.0.0
338
+ CLANG_VERSION : ' 14.0.6' # 15.0.6 requires libtinfo.so.6 (but Ubuntu 18 has v5 only)
344
339
CC : $CIRRUS_WORKING_DIR/../clang/bin/clang
345
340
CXX : $CIRRUS_WORKING_DIR/../clang/bin/clang++
346
341
<< : *INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
@@ -359,16 +354,16 @@ task:
359
354
mkdir -p llvm
360
355
tar -xf llvm.tar.xz --strip 1 -C llvm
361
356
rm llvm.tar.xz
357
+ # Make lld the default linker (likely with enabled assertions unfortunately)
358
+ ln -sf "$PWD/llvm/bin/ld.lld" /usr/bin/ld
359
+ ld --version
362
360
# Download & extract clang
363
361
download_prebuilt_clang_script : |
364
362
cd $CIRRUS_WORKING_DIR/..
365
363
curl -fL --retry 3 --max-time 300 -o clang.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-$CLANG_VERSION/clang+llvm-$CLANG_VERSION-$CI_ARCH-linux-gnu.tar.xz
366
364
mkdir clang
367
365
tar -xf clang.tar.xz --strip 1 -C clang
368
366
rm clang.tar.xz
369
- # Make lld the default linker
370
- ln -sf "$PWD/clang/bin/ld.lld" /usr/bin/ld
371
- ld --version
372
367
clone_submodules_early_script : |
373
368
cd $CIRRUS_WORKING_DIR
374
369
git submodule update --init --depth $CIRRUS_CLONE_DEPTH
0 commit comments