Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit f090993

Browse files
authored
Merge pull request #2526 from wilzbach/fix-circleci
[CircleCi] Fix build by using Ubuntu 18.04 as base merged-on-behalf-of: Sebastian Wilzbach <[email protected]>
2 parents 3a15737 + 49abd03 commit f090993

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ jobs:
33
build:
44
working_directory: ~/druntime
55
docker:
6-
- image: circleci/node:4.8.2
7-
parallelism: 2
6+
- image: circleci/buildpack-deps:18.04
7+
parallelism: 1
88
steps:
99
- checkout
1010
- run:

.circleci/run.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CIRCLE_PROJECT_REPONAME=${CIRCLE_PROJECT_REPONAME:-druntime}
1010

1111
case $CIRCLE_NODE_INDEX in
1212
0) MODEL=64 ;;
13-
1) MODEL=32 ;;
13+
1) MODEL=32 ;; # broken - https://issues.dlang.org/show_bug.cgi?id=19116
1414
esac
1515

1616
download() {
@@ -98,8 +98,7 @@ coverage() {
9898
# load environment for bootstrap compiler
9999
source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"
100100
101-
# build dmd and druntime (in debug and release)
102-
make -j$N -C ../dmd/src -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD="debug" all
101+
# build dmd (release) and druntime (debug)
103102
make -j$N -C ../dmd/src -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD="release" all
104103
TEST_COVERAGE="1" make -j$N -C . -f posix.mak MODEL=$MODEL unittest-debug
105104
}

0 commit comments

Comments
 (0)