|
2 | 2 |
|
3 | 3 | set -uexo pipefail |
4 | 4 |
|
5 | | -HOST_DMD_VER=2.072.2 # same as in dmd/src/posix.mak |
6 | 5 | CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)" |
7 | 6 | N=2 |
8 | 7 | CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0} |
9 | 8 | CIRCLE_PROJECT_REPONAME=${CIRCLE_PROJECT_REPONAME:-dmd} |
10 | 9 | BUILD="debug" |
| 10 | +DMD=dmd |
11 | 11 |
|
12 | 12 | case $CIRCLE_NODE_INDEX in |
13 | 13 | 0) MODEL=64 ;; |
@@ -48,19 +48,6 @@ download() { |
48 | 48 | done |
49 | 49 | } |
50 | 50 |
|
51 | | -install_deps() { |
52 | | - if [ $MODEL -eq 32 ]; then |
53 | | - sudo apt-get update --quiet=2 |
54 | | - sudo aptitude install g++-multilib --assume-yes --quiet=2 |
55 | | - fi |
56 | | - |
57 | | - download "https://dlang.org/install.sh" "https://nightlies.dlang.org/install.sh" "install.sh" |
58 | | - |
59 | | - source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash install.sh dmd-$HOST_DMD_VER --activate)" |
60 | | - $DC --version |
61 | | - env |
62 | | -} |
63 | | - |
64 | 51 | setup_repos() { |
65 | 52 | # set a default in case we run into rate limit restrictions |
66 | 53 | local base_branch="" |
@@ -92,9 +79,6 @@ setup_repos() { |
92 | 79 |
|
93 | 80 | coverage() |
94 | 81 | { |
95 | | - # load environment for bootstrap compiler |
96 | | - source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)" |
97 | | -
|
98 | 82 | # build dmd, druntime, and phobos |
99 | 83 | make -j$N -C src -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD ENABLE_WARNINGS=1 all |
100 | 84 | make -j$N -C ../druntime -f posix.mak MODEL=$MODEL |
@@ -144,9 +128,15 @@ codecov() |
144 | 128 | } |
145 | 129 |
|
146 | 130 | case $1 in |
147 | | - install-deps) install_deps ;; |
| 131 | + install-deps) echo "removed" ;; |
148 | 132 | setup-repos) setup_repos ;; |
149 | 133 | coverage) coverage ;; |
150 | 134 | check-clean-git) check_clean_git;; |
151 | 135 | codecov) codecov ;; |
| 136 | + all) |
| 137 | + setup_repos; |
| 138 | + coverage; |
| 139 | + check-clean-git; |
| 140 | + codecov; |
| 141 | + ;; |
152 | 142 | esac |
0 commit comments