Skip to content

Fix CircleCI build #7160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 3 commits into from
Aug 29, 2019
Merged

Fix CircleCI build #7160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba2195b
[CircleCI] Upgrade host dmd version from 2.078.1 to 2.079.1
PetarKirov Aug 29, 2019
de6c26e
[circleci] Fix building dmd - use dmd/src/build.d instead of dmd/src/…
PetarKirov Aug 29, 2019
2a57ec3
[circleci]: Merge the 'Install gdb' step into .circleci/run.sh instal…
PetarKirov Aug 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .circleci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;;
Expand All @@ -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 ||
Expand Down Expand Up @@ -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
}

Expand Down