From cd37b1ae14b4137610b0e6de4a8cf81d3f4ddd57 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Wed, 13 Dec 2017 01:05:45 +0100 Subject: [PATCH 1/5] Bump vibe-d to 0.8.3-alpha.1 --- examples/htmlserver/dub.sdl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/htmlserver/dub.sdl b/examples/htmlserver/dub.sdl index 648153f..82c7c31 100644 --- a/examples/htmlserver/dub.sdl +++ b/examples/htmlserver/dub.sdl @@ -1,4 +1,4 @@ name "htmlserver" dependency "diet-ng" path="../.." -dependency "vibe-d" version="~>0.8.0" +dependency "vibe-d" version="~>0.8.3-alpha.1" versions "VibeDefaultMain" From 4f1b6541f064c8b709b9203310bf1eb7fe1b35d8 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Tue, 23 Jan 2018 22:56:20 +0100 Subject: [PATCH 2/5] Set pyenv to 3.6 to fix the Travis errors --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 999ac94..02d18fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ d: - dmd-beta before_install: + - pyenv global system 3.6 - pip3 install meson>=0.40 install: From a685c33860d2f3118cabd640e8a9d07879676ce4 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Wed, 24 Jan 2018 16:15:30 +0100 Subject: [PATCH 3/5] StreamOutputRange -> streamOutputRange --- examples/htmlserver/source/app.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/htmlserver/source/app.d b/examples/htmlserver/source/app.d index c71c18a..a1313c2 100644 --- a/examples/htmlserver/source/app.d +++ b/examples/htmlserver/source/app.d @@ -4,7 +4,7 @@ import vibe.stream.wrapper; void render(scope HTTPServerRequest req, scope HTTPServerResponse res) { - auto dst = StreamOutputRange(res.bodyWriter); + auto dst = streamOutputRange(res.bodyWriter); int iterations = 10; dst.compileHTMLDietFile!("index.dt", iterations); } From 974808e632550134188ac186b462df30d9fb3ceb Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Wed, 24 Jan 2018 16:51:42 +0100 Subject: [PATCH 4/5] Update list of tested compilers on Travis --- .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02d18fd..042be9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,18 +15,20 @@ d: # this way the overall test time gets cut down (GDC/LDC are a lot # slower tham DMD, so they should be started early), while still # catching most DMD version related build failures early - - dmd-2.075.1 - - dmd-2.068.2 + - dmd-2.078.1 + - dmd-2.072.2 + - ldc-1.7.0 + - ldc-1.6.0 + - ldc-1.5.0 + - ldc-1.4.0 - ldc-1.3.0 - ldc-1.2.0 - - ldc-1.1.1 + - dmd-2.077.1 + - dmd-2.076.1 + - dmd-2.075.1 - dmd-2.074.1 - dmd-2.073.2 - dmd-2.072.2 - - dmd-2.071.2 - - dmd-2.070.2 - - dmd-2.069.2 - - dmd-beta before_install: - pyenv global system 3.6 From 4af66503a0105d7a0cb4ff8ed1014cb8da1579e0 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Wed, 24 Jan 2018 18:05:24 +0100 Subject: [PATCH 5/5] Temporarily disable meson --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 042be9b..d259806 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,17 +30,17 @@ d: - dmd-2.073.2 - dmd-2.072.2 -before_install: - - pyenv global system 3.6 - - pip3 install meson>=0.40 +#before_install: + #- pyenv global system 3.6 + #- pip3 install meson>=0.40 -install: - - mkdir .ntmp - - curl -L https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip -o .ntmp/ninja-linux.zip - - unzip .ntmp/ninja-linux.zip -d .ntmp +#install: + #- mkdir .ntmp + #- curl -L https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip -o .ntmp/ninja-linux.zip + #- unzip .ntmp/ninja-linux.zip -d .ntmp -before_script: - - export PATH=$PATH:$PWD/.ntmp +#before_script: + #- export PATH=$PATH:$PWD/.ntmp script: - dub build -b release @@ -49,6 +49,6 @@ script: - dub build --root examples/htmlserver # test building with Meson - mkdir build && cd build - - meson .. - - ninja -j4 - - DESTDIR=/tmp/diet_inst_target ninja install + #- meson .. + #- ninja -j4 + #- DESTDIR=/tmp/diet_inst_target ninja install