Skip to content

Remove digger setup and use the compiler from Travis #298

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
MartinNowak merged 1 commit into from
Jan 26, 2018
Merged

Remove digger setup and use the compiler from Travis #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
language: d
d:
- dmd
sudo: false

matrix:
include:
- env: MODEL=64
- env: MODEL=32
- d: dmd
env: MODEL=64
- d: dmd-nightly
env: MODEL=64
- d: dmd
env: MODEL=32
addons:
apt:
packages:
Expand Down
33 changes: 2 additions & 31 deletions travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,5 @@

set -uexo pipefail

DIGGER_DIR="../digger"
DIGGER="../digger/digger"

# set to 64-bit by default
if [ -z ${MODEL:-} ] ; then
MODEL=64
fi

build_digger() {
git clone --recursive https://github.com/CyberShadow/Digger "$DIGGER_DIR"
git -C "$DIGGER_DIR" checkout v3.0.0-alpha-5
(cd "$DIGGER_DIR" && rdmd --build-only -debug digger)
}

install_digger() {
$DIGGER build --model=$MODEL "master"
export PATH=$PWD/work/result/bin:$PATH
}

if ! [ -d "$DIGGER_DIR" ] ; then
build_digger
fi

install_digger

dmd --version
rdmd --help | head -n 1
dub --version
Copy link
Contributor

@WebDrake WebDrake Feb 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why were these 3 lines removed? They don't seem related to the rest of the PR and I'd have thought it's convenient to have dmd, rdmd and dub report their versions in the build logs.

Copy link
Contributor Author

@wilzbach wilzbach Feb 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are automatically added by our Travis integration.


make -f posix.mak all DMD=$(which dmd)
make -f posix.mak test DMD=$(which dmd)
make -f posix.mak all DMD="$(which $DMD)"
make -f posix.mak test DMD="$(which $DMD)"