Skip to content
Snippets Groups Projects
Unverified Commit cfc8362c authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

Version bump.

parent ea7b6b65
No related branches found
No related tags found
No related merge requests found
name: Cabal name: Cabal
version: 2.1.0.0 version: 2.3.0.0
copyright: 2003-2017, Cabal Development Team (see AUTHORS file) copyright: 2003-2017, Cabal Development Team (see AUTHORS file)
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
......
...@@ -29,9 +29,9 @@ build_script: ...@@ -29,9 +29,9 @@ build_script:
- Setup install - Setup install
# hackage-repo-tool doesn't build on Windows: # hackage-repo-tool doesn't build on Windows:
# https://github.com/well-typed/hackage-security/issues/175 # https://github.com/well-typed/hackage-security/issues/175
# - echo "" | ..\cabal install hackage-repo-tool --allow-newer=Cabal,time --constraint="Cabal == 2.1.0.0" # - echo "" | ..\cabal install hackage-repo-tool --allow-newer=Cabal,time --constraint="Cabal == 2.3.0.0"
- cd ..\cabal-testsuite - cd ..\cabal-testsuite
- ghc --make -threaded -i Setup.hs -package Cabal-2.1.0.0 - ghc --make -threaded -i Setup.hs -package Cabal-2.3.0.0
- echo "" | ..\appveyor-retry ..\cabal install --only-dependencies --enable-tests - echo "" | ..\appveyor-retry ..\cabal install --only-dependencies --enable-tests
- Setup configure --user --ghc-option=-Werror --enable-tests - Setup configure --user --ghc-option=-Werror --enable-tests
- Setup build - Setup build
......
...@@ -221,8 +221,8 @@ NETWORK_VER="2.6.3.2"; NETWORK_VER_REGEXP="2\.[0-6]\." ...@@ -221,8 +221,8 @@ NETWORK_VER="2.6.3.2"; NETWORK_VER_REGEXP="2\.[0-6]\."
# >= 2.0 && < 2.7 # >= 2.0 && < 2.7
NETWORK_URI_VER="2.6.1.0"; NETWORK_URI_VER_REGEXP="2\.6\." NETWORK_URI_VER="2.6.1.0"; NETWORK_URI_VER_REGEXP="2\.6\."
# >= 2.6 && < 2.7 # >= 2.6 && < 2.7
CABAL_VER="2.1.0.0"; CABAL_VER_REGEXP="2\.1\.[0-9]" CABAL_VER="2.3.0.0"; CABAL_VER_REGEXP="2\.3\.[0-9]"
# >= 2.1 && < 2.2 # >= 2.3 && < 2.4
TRANS_VER="0.5.5.0"; TRANS_VER_REGEXP="0\.[45]\." TRANS_VER="0.5.5.0"; TRANS_VER_REGEXP="0\.[45]\."
# >= 0.2.* && < 0.6 # >= 0.2.* && < 0.6
MTL_VER="2.2.1"; MTL_VER_REGEXP="[2]\." MTL_VER="2.2.1"; MTL_VER_REGEXP="[2]\."
......
Name: cabal-install Name: cabal-install
Version: 2.1.0.0 Version: 2.3.0.0
Synopsis: The command-line interface for Cabal and Hackage. Synopsis: The command-line interface for Cabal and Hackage.
Description: Description:
The \'cabal\' command-line program simplifies the process of managing The \'cabal\' command-line program simplifies the process of managing
......
name: cabal-testsuite name: cabal-testsuite
version: 2.1.0.0 version: 2.3.0.0
copyright: 2003-2017, Cabal Development Team (see AUTHORS file) copyright: 2003-2017, Cabal Development Team (see AUTHORS file)
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
......
name: solver-benchmarks name: solver-benchmarks
version: 2.1.0.0 version: 2.3.0.0
copyright: 2003-2017, Cabal Development Team (see AUTHORS file) copyright: 2003-2017, Cabal Development Team (see AUTHORS file)
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
......
set -e set -e
HACKAGE_REPO_TOOL_VERSION="0.1.1" HACKAGE_REPO_TOOL_VERSION="0.1.1"
CABAL_VERSION="2.1.0.0" CABAL_VERSION="2.3.0.0"
if [ "$TRAVIS_OS_NAME" = "linux" ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then
ARCH="x86_64-linux" ARCH="x86_64-linux"
......
...@@ -8,7 +8,7 @@ deploy() { ...@@ -8,7 +8,7 @@ deploy() {
(cd cabal-website && git checkout --track -b gh-pages origin/gh-pages) (cd cabal-website && git checkout --track -b gh-pages origin/gh-pages)
rm -rf cabal-website/doc rm -rf cabal-website/doc
mkdir -p cabal-website/doc/html mkdir -p cabal-website/doc/html
mv dist-newstyle/build/Cabal-2.1.0.0/doc/html/Cabal \ mv dist-newstyle/build/Cabal-2.3.0.0/doc/html/Cabal \
cabal-website/doc/html/Cabal cabal-website/doc/html/Cabal
(cd cabal-website && git add --all .) (cd cabal-website && git add --all .)
(cd cabal-website && \ (cd cabal-website && \
......
validate.sh 100644 → 100755
...@@ -44,7 +44,7 @@ CABALTESTS=${CABALTESTS-true} ...@@ -44,7 +44,7 @@ CABALTESTS=${CABALTESTS-true}
CABALINSTALLTESTS=${CABALINSTALLTESTS-true} CABALINSTALLTESTS=${CABALINSTALLTESTS-true}
CABALSUITETESTS=${CABALSUITETESTS-true} CABALSUITETESTS=${CABALSUITETESTS-true}
CABAL_VERSION="2.1.0.0" CABAL_VERSION="2.3.0.0"
if [ "$(uname)" = "Linux" ]; then if [ "$(uname)" = "Linux" ]; then
ARCH="x86_64-linux" ARCH="x86_64-linux"
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment