Merge pull request #7160 from dlang/upgrade-circle-ci

Fix CircleCI build merged-on-behalf-of: Petar Kirov <ZombineDev@users.noreply.github.com>
dlang · Aug 29, 2019 · 9b58623 · 9b58623
2 parents f7fc24c + 2a57ec3
commit 9b58623
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,9 +13,6 @@ jobs:
       - run:
           command: ./.circleci/run.sh setup-repos
           name: Clone DMD & DRuntime
-      - run:
-          command: sudo apt-get update && sudo apt-get install -y gdb
-          name: Install gdb
       - run:
           command: ./.circleci/run.sh publictests
           name: Run all public unittests

diff --git a/.circleci/run.sh b/.circleci/run.sh
@@ -2,12 +2,13 @@
 
 set -uexo pipefail
 
-HOST_DMD_VER=2.078.1
+HOST_DMD_VER=2.079.1
 CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
 DUB=${DUB:-dub}
 N=2
 CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
 BUILD="debug"
+PIC=1
 
 case $CIRCLE_NODE_INDEX in
     0) MODEL=64 ;;
@@ -20,7 +21,7 @@ install_deps() {
         sudo apt-get install g++-multilib
     fi
     # required for: "core.time.TimeException@std/datetime/timezone.d(2073): Directory /usr/share/zoneinfo/ does not exist."
-    sudo apt-get install --reinstall tzdata
+    sudo apt-get install --reinstall tzdata gdb
 
     for i in {0..4}; do
         if curl -fsS -A "$CURL_USER_AGENT" --max-time 5 https://dlang.org/install.sh -O ||
@@ -89,7 +90,7 @@ setup_repos()
     source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"
 
     # build dmd and druntime
-    make -j$N -C ../dmd/src -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD all
+    pushd ../dmd && ./src/build.d MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD PIC="$PIC" all && popd
     make -j$N -C ../druntime -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD
 }