Skip to content

Commit 3c5af94

Browse files
authoredOct 24, 2020
Merge pull request #3595 from kinke/ci
CI: Bump some versions etc.
2 parents cad7f73 + 3eec178 commit 3c5af94

File tree

8 files changed

+24
-25
lines changed

8 files changed

+24
-25
lines changed
 

‎.azure-pipelines/posix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ steps:
1414
if [ "$CI_OS" = "osx" ]; then
1515
sudo xcode-select --switch /Applications/Xcode_12.2.app/Contents/Developer
1616
# Download & extract Ninja
17-
curl -L -o ninja-mac.zip https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-mac.zip
17+
curl -L -o ninja-mac.zip https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-mac.zip
1818
mkdir ninja
1919
tar -xf ninja-mac.zip -C ninja
2020
else

‎.azure-pipelines/windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ steps:
2828
)
2929
cd ..
3030
:: Download & extract Ninja
31-
curl -L -o ninja.zip https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip 2>&1
31+
curl -L -o ninja.zip https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-win.zip 2>&1
3232
mkdir ninja
3333
cd ninja
3434
7z x ../ninja.zip > nul

‎.circleci/config.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ commonSteps: &commonSteps
2626
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.gold 99
2727
else
2828
# Download & extract CMake
29-
curl -L -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.16.5/cmake-3.16.5-Darwin-x86_64.tar.gz
29+
curl -L -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-Darwin-x86_64.tar.gz
3030
mkdir cmake
3131
tar -xf cmake.tar.gz --strip 3 -C cmake
3232
rm cmake.tar.gz
3333
# Download & extract Ninja
34-
curl -OL https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-mac.zip
34+
curl -OL https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-mac.zip
3535
mkdir ninja
3636
tar -xf ninja-mac.zip -C ninja
3737
rm ninja-mac.zip
@@ -113,7 +113,7 @@ jobs:
113113
- PARALLELISM: 2
114114
- CI_OS: linux
115115
- LIBCLANG_COMMON_VERSION: "6.0"
116-
- HOST_LDC_VERSION: 1.22.0
116+
- HOST_LDC_VERSION: 1.24.0
117117
- EXTRA_CMAKE_FLAGS: "-DMULTILIB=ON -DRT_SUPPORT_SANITIZERS=ON -DBUILD_LTO_LIBS=ON -DLDC_INSTALL_LTOPLUGIN=ON -DLDC_INSTALL_LLVM_RUNTIME_LIBS=ON"
118118
Ubuntu-20.04-sharedLibsOnly-gdmd:
119119
<<: *commonSteps
@@ -124,27 +124,27 @@ jobs:
124124
- CI_OS: linux
125125
- LIBCLANG_COMMON_VERSION: "10"
126126
- EXTRA_APT_PACKAGES: gdmd
127-
- HOST_LDC_VERSION: 1.22.0
127+
- HOST_LDC_VERSION: 1.24.0
128128
- EXTRA_CMAKE_FLAGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_LTO_LIBS=ON -DLDC_INSTALL_LTOPLUGIN=ON -DLDC_INSTALL_LLVM_RUNTIME_LIBS=ON -DD_COMPILER=gdmd -DLDC_LINK_MANUALLY=ON"
129129
macOS-x64:
130130
<<: *commonSteps
131131
macos:
132-
xcode: "11.5.0"
132+
xcode: "12.1.0"
133133
environment:
134134
- PARALLELISM: 4
135135
- CI_OS: osx
136136
- LLVM_VERSION: 11.0.0
137-
- HOST_LDC_VERSION: 1.22.0
137+
- HOST_LDC_VERSION: 1.24.0
138138
- EXTRA_CMAKE_FLAGS: "-DBUILD_LTO_LIBS=ON"
139139
macOS-x64-sharedLibsOnly:
140140
<<: *commonSteps
141141
macos:
142-
xcode: "11.5.0"
142+
xcode: "12.1.0"
143143
environment:
144144
- PARALLELISM: 4
145145
- CI_OS: osx
146146
- LLVM_VERSION: 11.0.0
147-
- HOST_LDC_VERSION: 1.22.0
147+
- HOST_LDC_VERSION: 1.24.0
148148
- EXTRA_CMAKE_FLAGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_LTO_LIBS=ON"
149149

150150
workflows:

‎.cirrus.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ install_macos_prerequisites_template: &INSTALL_MACOS_PREREQUISITES_TEMPLATE
8383
cd $CIRRUS_WORKING_DIR/..
8484
sysctl -n hw.logicalcpu
8585
# Download & extract CMake
86-
curl --max-time 300 --retry 3 -L -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.16.5/cmake-3.16.5-Darwin-x86_64.tar.gz
86+
curl --max-time 300 --retry 3 -L -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-Darwin-x86_64.tar.gz
8787
mkdir cmake
8888
tar -xf cmake.tar.gz --strip 3 -C cmake
8989
rm cmake.tar.gz
9090
# Download & extract Ninja
91-
curl --max-time 300 --retry 3 -OL https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-mac.zip
91+
curl --max-time 300 --retry 3 -OL https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-mac.zip
9292
mkdir ninja
9393
tar -xf ninja-mac.zip -C ninja
9494
rm ninja-mac.zip
@@ -105,7 +105,7 @@ install_macos_prerequisites_template: &INSTALL_MACOS_PREREQUISITES_TEMPLATE
105105
106106
environment:
107107
CIRRUS_CLONE_DEPTH: 50
108-
HOST_LDC_VERSION: 1.22.0
108+
HOST_LDC_VERSION: 1.24.0
109109

110110
task:
111111
name: Ubuntu 18.04 x64 multilib rtSanitizers

‎.travis.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,17 @@ matrix:
3232
d: dmd-beta
3333
env: LLVM_VERSION=6.0.1 OPTS="-DLIB_SUFFIX=64 -DLDC_LINK_MANUALLY=ON"
3434
- os: osx
35-
osx_image: xcode10.3
35+
osx_image: xcode11.3
3636
d: dmd-beta
3737
env: LLVM_VERSION=10.0.0 OPTS="-DBUILD_SHARED_LIBS=ON -DRT_SUPPORT_SANITIZERS=ON -DLDC_LINK_MANUALLY=ON"
3838
- os: osx
39-
osx_image: xcode10.3
39+
osx_image: xcode11.3
4040
d: ldc-beta
4141
env: LLVM_VERSION=7.0.0 OPTS="-DBUILD_SHARED_LIBS=OFF"
4242

4343
cache:
4444
directories:
45+
- llvm-11.0.0
4546
- llvm-10.0.0
4647
- llvm-9.0.0
4748
- llvm-8.0.0
@@ -93,7 +94,7 @@ install:
9394
sudo python get-pip.py
9495
rm get-pip.py
9596
# Download & extract Ninja & add to PATH
96-
wget -O ninja-mac.zip https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-mac.zip
97+
wget -O ninja-mac.zip https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-mac.zip
9798
mkdir ninja
9899
tar -xf ninja-mac.zip -C ninja
99100
rm ninja-mac.zip

‎azure-pipelines.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
variables:
22
LLVM_VERSION: 11.0.0
3-
CLANG_VERSION: 10.0.1
4-
HOST_LDC_VERSION: 1.22.0
3+
CLANG_VERSION: 11.0.0
4+
HOST_LDC_VERSION: 1.24.0
55

66
trigger:
77
- '*'
@@ -13,7 +13,6 @@ jobs:
1313
pool:
1414
vmImage: 'windows-2019'
1515
variables:
16-
CLANG_VERSION: 10.0.0
1716
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\
1817
strategy:
1918
matrix:

‎bitrise.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ app:
88
- BITRISE_SCHEME: TestRunner
99
- BITRISE_EXPORT_METHOD: development
1010
- LLVM_VERSION: 11.0.0
11-
- LDC_VERSION: 1.22.0
11+
- HOST_LDC_VERSION: 1.24.0
1212
- IOS_VERSION: 12.0
1313

1414
workflows:
@@ -33,9 +33,9 @@ workflows:
3333
- content: |-
3434
#!/bin/bash
3535
set -ex
36-
curl -L "https://github.com/ldc-developers/ldc/releases/download/v${LDC_VERSION}/ldc2-${LDC_VERSION}-osx-x86_64.tar.xz" -o ldc.tar.xz
36+
curl -L "https://github.com/ldc-developers/ldc/releases/download/v${HOST_LDC_VERSION}/ldc2-${HOST_LDC_VERSION}-osx-x86_64.tar.xz" -o ldc.tar.xz
3737
tar xf ldc.tar.xz
38-
envman add --key PATH --value "$(pwd)/ldc2-${LDC_VERSION}-osx-x86_64/bin:$PATH"
38+
envman add --key PATH --value "$(pwd)/ldc2-${HOST_LDC_VERSION}-osx-x86_64/bin:$PATH"
3939
4040
- script@1.1.6:
4141
title: Build LDC

‎shippable.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
- secure: RQ6gpJFPBDGVlnz+ZzSgeMpkcnvcA/7Lzyj/r06fMFR5iOz2cYaImCekNRw2PlhYQ+0FCQ119TLMKNOa7OUu6XxUp5LZtq7pSB6QLe3RB3YysFsosNPlY/wyyRsrW9ICEbDP/X8kPcfrDtOPGS/dGIwgeo0+R4Yl0OLDK9GrExEY45bWgvuLqoWDO89pi31kBk5LG5MAYhHZ0UTdboi5A2GRT0T8M0kr53jBRka8FGkbncXfHp9+/6IjTVJoUduRkdsk0A9RN1KRoao6rtrBNNvwIStc6zxJSOHszoaTp/K/ucGC4InZl/9GHPS/Y78SGKn7YJv3tGmcGzqAxrVaXQ==
1515
matrix:
1616
- LLVM_VERSION=11.0.0
17-
HOST_LDC_VERSION=1.22.0
17+
HOST_LDC_VERSION=1.24.0
1818
EXTRA_CMAKE_FLAGS="-DBUILD_LTO_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS=-static-libstdc++ -DJITRT_EXTRA_LDFLAGS=-static-libstdc++ -DLDC_INSTALL_LTOPLUGIN=ON -DLDC_INSTALL_LLVM_RUNTIME_LIBS=ON -DLDC_INSTALL_LLVM_RUNTIME_LIBS_ARCH=aarch64"
1919

2020
build:
@@ -48,14 +48,13 @@ build:
4848
- ninja --version
4949
- mkdir bootstrap-ldc
5050
- cd bootstrap-ldc
51-
# FIXME: -DCOMPILE_D_MODULES_SEPARATELY=ON cannot be used since v1.23 due to
52-
# undefined symbols (template culling...) when compiling separately.
5351
- |
5452
DFLAGS='-linker=bfd' cmake -G Ninja .. \
5553
-DCMAKE_BUILD_TYPE=Release \
5654
-DLLVM_ROOT_DIR=$PWD/../llvm \
5755
-DD_COMPILER=$PWD/../host-ldc/bin/ldmd2 \
5856
-DBUILD_SHARED_LIBS=OFF \
57+
-DCOMPILE_D_MODULES_SEPARATELY=ON \
5958
-DCOMPILE_ALL_D_FILES_AT_ONCE=OFF \
6059
-DADDITIONAL_DEFAULT_LDC_SWITCHES=' "-linker=bfd",' \
6160
-DLDC_LINK_MANUALLY=OFF

0 commit comments

Comments
 (0)
Please sign in to comment.