From e8d4b78a3f2c3ce26e817b62f09ceb6f01b91467 Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Sat, 16 Feb 2019 00:09:35 +0100 Subject: [PATCH] Build dhall-json with lts-6 in appveyor (#818) --- appveyor.yml | 5 ++--- stack-lts-6.yaml | 3 +-- stack.yaml | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index dfaf19a..e79bb7a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,9 +34,8 @@ build_script: - if /I "%APPVEYOR_REPO_TAG%" EQU "true" (set DEPLOY_TAG=%APPVEYOR_REPO_TAG_NAME%) else (set DEPLOY_TAG=%APPVEYOR_REPO_COMMIT:~0,5%) - set DEPLOY_SUFFIX=%DEPLOY_TAG%-x86_64-windows.zip - 7z a "bin\dhall-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall.exe" - # dhall-json cannot be built with lts-6 - - if exist "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-json.exe" ( 7z a "bin\dhall-json-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-json.exe" ) - - if exist "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-yaml.exe" ( 7z a "bin\dhall-json-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-yaml.exe" ) + - 7z a "bin\dhall-json-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-json.exe" + - 7z a "bin\dhall-json-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-yaml.exe" - 7z a "bin\dhall-text-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-text.exe" - 7z a "bin\dhall-bash-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-bash.exe" diff --git a/stack-lts-6.yaml b/stack-lts-6.yaml index 81affc7..aff83b4 100644 --- a/stack-lts-6.yaml +++ b/stack-lts-6.yaml @@ -2,8 +2,7 @@ resolver: lts-6.27 packages: - dhall - dhall-bash -# dhall-json uses ApplicativeDo -# - dhall-json + - dhall-json - dhall-text extra-deps: - ansi-terminal-0.7.1.1 diff --git a/stack.yaml b/stack.yaml index f40422f..5aac3d6 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-13.3 +resolver: lts-13.5 packages: - dhall - dhall-bash