From e4591f5847ea5bb7bbdc43ae7d955523d1982043 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Thu, 18 Jan 2018 01:54:33 +0100 Subject: [PATCH 1/4] Fix imports --- source/dyaml/parser.d | 1 + 1 file changed, 1 insertion(+) diff --git a/source/dyaml/parser.d b/source/dyaml/parser.d index d5714f4..b570291 100644 --- a/source/dyaml/parser.d +++ b/source/dyaml/parser.d @@ -596,6 +596,7 @@ final class Parser // Any hex digits are 1-byte so this works. char[] hex = oldValue[0 .. hexLength]; oldValue = oldValue[hexLength .. $]; + import std.ascii : isHexDigit; assert(!hex.canFind!(d => !d.isHexDigit), "Scanner must ensure the hex string is valid"); From 8465a4a4b9680623e0e3739bea22cd3711a345b0 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Thu, 18 Jan 2018 02:08:57 +0100 Subject: [PATCH 2/4] Update AppVeyor LDC links --- appveyor.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c3a2c1c..965f4cc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -59,17 +59,18 @@ install: - ps: function ResolveLatestLDC { $version = $env:DVersion; + $arch = $env:arch; if($version -eq "stable") { $latest = (Invoke-WebRequest "https://ldc-developers.github.io/LATEST").toString().replace("`n","").replace("`r",""); - $url = "https://github.com/ldc-developers/ldc/releases/download/v$($latest)/ldc2-$($latest)-win64-msvc.zip"; + $url = "https://github.com/ldc-developers/ldc/releases/download/v$($latest)/ldc2-$($latest)-windows-$($arch).7z"; }elseif($version -eq "beta") { $latest = (Invoke-WebRequest "https://ldc-developers.github.io/LATEST_BETA").toString().replace("`n","").replace("`r",""); - $url = "https://github.com/ldc-developers/ldc/releases/download/v$($latest)/ldc2-$($latest)-win64-msvc.zip"; + $url = "https://github.com/ldc-developers/ldc/releases/download/v$($latest)/ldc2-$($latest)-windows-$($arch).7z"; } else { $latest = $version; - $url = "https://github.com/ldc-developers/ldc/releases/download/v$($version)/ldc2-$($version)-win64-msvc.zip"; + $url = "https://github.com/ldc-developers/ldc/releases/download/v$($version)/ldc2-$($version)-windows-$($arch).7z"; } - $env:PATH += ";C:\ldc2-$($latest)-win64-msvc\bin"; + $env:PATH += ";C:\ldc2-$($latest)-windows-$($arch)\bin"; $env:DC = "ldc2"; return $url; } From d830832b02bb74f8c6c86118df91ad76394c977d Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Thu, 18 Jan 2018 02:22:18 +0100 Subject: [PATCH 3/4] Fix testsuite --- test/data/construct-bool.data | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/data/construct-bool.data b/test/data/construct-bool.data index 36d6519..4c0b757 100644 --- a/test/data/construct-bool.data +++ b/test/data/construct-bool.data @@ -2,6 +2,10 @@ canonical: yes answer: NO logical: True option: on +constbool: on +imutbool: on +const_bool: on +imut_bool: on but: From 25e3a4fa652ca0a023570ccf498496e31e264292 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Thu, 18 Jan 2018 02:25:10 +0100 Subject: [PATCH 4/4] Temporarily disable meson builds --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba3ec46..1f8ddf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,9 +27,9 @@ before_script: - export PATH=$PATH:$PWD/.ntmp script: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then meson build && ninja -j8 -C build; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ninja -j8 -C build test -v; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson build && ninja -j8 -C build test; fi + #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then meson build && ninja -j8 -C build; fi + #- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ninja -j8 -C build test -v; fi + #- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson build && ninja -j8 -C build test; fi - dub build - dub test --build=unittest-cov after_success: