Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
version: 2
version: 2.1
jobs:
build:
working_directory: ~/phobos
docker:
- image: cimg/base:current-20.04
parallelism: 1
machine:
image: ubuntu-2604:current
resource_class: large.gen3
steps:
- checkout
- run:
command: ./.circleci/run.sh install-deps
name: Install DMD
- run:
command: ./.circleci/run.sh setup-repos
name: Clone DMD & DRuntime
name: Clone DMD & tools and build DMD & druntime
- run:
command: ./.circleci/run.sh publictests
name: Run all public unittests
Expand Down
7 changes: 3 additions & 4 deletions .circleci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -uexo pipefail
HOST_DMD_VER=2.095.0
CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
DUB=${DUB:-dub}
N=${N:-2}
N=${N:-$(nproc)}
CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
BUILD="debug"
PIC=1
Expand Down Expand Up @@ -40,7 +40,7 @@ install_deps() {
env
}

# clone dmd and druntime
# clone dmd and tools
clone() {
local url="$1"
local path="$2"
Expand Down Expand Up @@ -89,8 +89,7 @@ setup_repos()
source "$(CURL_USER_AGENT="$CURL_USER_AGENT" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"

# build dmd and druntime
pushd ../dmd && ./src/build.d MODEL=$MODEL HOST_DMD="$DMD" BUILD=$BUILD PIC="$PIC" all && popd
pushd ../dmd && make -j"$N" -C druntime -f posix.mak MODEL=$MODEL HOST_DMD="$DMD" BUILD=$BUILD && popd
make -C ../dmd -j"$N" MODEL=$MODEL BUILD=$BUILD PIC="$PIC"
}

# run unittest with coverage
Expand Down
Loading