Commit 5b28d47b authored by Oleg Grenrus's avatar Oleg Grenrus Committed by GitHub

Merge pull request #6956 from phadej/bump-version-to-3.4

Bump version to 3.4
parents 6ef004e1 573fdd12
......@@ -3,11 +3,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......@@ -123,7 +123,7 @@ jobs:
shell: bash
run: |
cabal v2-build cabal-install:exe:cabal
cp dist-newstyle/build/x86_64-windows/ghc-8.6.5/cabal-install-3.3.0.0/x/cabal/build/cabal/cabal.exe cabal.exe
cp dist-newstyle/build/x86_64-windows/ghc-8.6.5/cabal-install-3.4.0.0/x/cabal/build/cabal/cabal.exe cabal.exe
- name: Smoke test
shell: bash
run: |
......
......@@ -9,11 +9,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......
......@@ -9,11 +9,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......
......@@ -9,11 +9,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......
......@@ -9,11 +9,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......
......@@ -9,11 +9,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......@@ -74,4 +74,4 @@ jobs:
cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
- name: cabal-tests
# Using only one job, -j1, to fail less.
run: cabal v2-run cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.3.0.0\x\cabal\build\cabal\cabal.exe
run: cabal v2-run cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.4.0.0\x\cabal\build\cabal\cabal.exe
cabal-version: 2.2
name: Cabal-QuickCheck
version: 3.3.0.0
version: 3.4.0.0
synopsis: QuickCheck instances for types in Cabal
category: Testing
description:
......@@ -13,7 +13,7 @@ library
build-depends:
, base
, bytestring
, Cabal ^>=3.3.0.0
, Cabal ^>=3.4.0.0
, QuickCheck ^>=2.13.2 || ^>=2.14
if !impl(ghc >= 8.0)
......
cabal-version: 2.2
name: Cabal-described
version: 3.3.0.0
version: 3.4.0.0
synopsis: Described functionality for types in Cabal
category: Testing, Parsec
description: Provides rere bindings
......@@ -11,7 +11,7 @@ library
ghc-options: -Wall
build-depends:
, base
, Cabal ^>=3.3.0.0
, Cabal ^>=3.4.0.0
, containers
, pretty
, QuickCheck
......
cabal-version: 2.2
name: Cabal-tree-diff
version: 3.3.0.0
version: 3.4.0.0
synopsis: QuickCheck instances for types in Cabal
category: Testing
description: Provides tree-diff ToExpr instances for some types in Cabal
......@@ -11,7 +11,7 @@ library
ghc-options: -Wall
build-depends:
, base
, Cabal ^>=3.3.0.0
, Cabal ^>=3.4.0.0
, tree-diff ^>=0.1
exposed-modules: Data.TreeDiff.Instances.Cabal
......
cabal-version: >=1.10
name: Cabal
version: 3.3.0.0
version: 3.4.0.0
copyright: 2003-2020, Cabal Development Team (see AUTHORS file)
license: BSD3
license-file: LICENSE
......
VERSION=3.3.0.0
VERSION=3.4.0.0
#KIND=devel
KIND=rc
......
......@@ -13,7 +13,7 @@ import sphinx_rtd_theme
sys.path.insert(0, os.path.abspath('.'))
import cabaldomain
version = "3.3.0.0"
version = "3.4.0.0"
extensions = ['sphinx.ext.extlinks', 'sphinx.ext.todo']
......
......@@ -55,7 +55,7 @@ build_script:
- cabal %CABOPTS% v2-test Cabal
- appveyor-retry cabal %CABOPTS% v2-build exe:cabal exe:cabal-tests --only-dependencies
- cabal %CABOPTS% v2-build exe:cabal
- cabal %CABOPTS% v2-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.3.0.0\x\cabal\build\cabal\cabal.exe
- cabal %CABOPTS% v2-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.4.0.0\x\cabal\build\cabal\cabal.exe
- appveyor-retry cabal %CABOPTS% v2-build cabal-install:tests --only-dependencies
- cd cabal-install
- cabal %CABOPTS% v2-run cabal-install:memory-usage-tests
......
......@@ -3,11 +3,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......@@ -123,7 +123,7 @@ jobs:
shell: bash
run: |
cabal v2-build cabal-install:exe:cabal
cp dist-newstyle/build/x86_64-windows/ghc-8.6.5/cabal-install-3.3.0.0/x/cabal/build/cabal/cabal.exe cabal.exe
cp dist-newstyle/build/x86_64-windows/ghc-8.6.5/cabal-install-3.4.0.0/x/cabal/build/cabal/cabal.exe cabal.exe
- name: Smoke test
shell: bash
run: |
......
......@@ -9,11 +9,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......
......@@ -9,11 +9,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......
......@@ -9,11 +9,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......
......@@ -9,11 +9,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......
......@@ -9,11 +9,11 @@ on:
push:
branches:
- master
- "3.2"
- "3.4"
pull_request:
branches:
- master
- "3.4"
release:
types:
- created
......@@ -81,5 +81,5 @@ jobs:
cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
- name: cabal-tests
# Using only one job, -j1, to fail less.
run: cabal v2-run cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-{{ job.version }}\cabal-install-3.3.0.0\x\cabal\build\cabal\cabal.exe
run: cabal v2-run cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-{{ job.version }}\cabal-install-3.4.0.0\x\cabal\build\cabal\cabal.exe
{% endfor %}
......@@ -227,8 +227,8 @@ NETWORK_URI_VER="2.6.1.0"; NETWORK_URI_VER_REGEXP="2\.6\.(0\.[2-9]|[1-9])"
# >= 2.6.0.2 && < 2.7
NETWORK_VER="2.7.0.0"; NETWORK_VER_REGEXP="2\.[0-7]\."
# >= 2.0 && < 2.7
CABAL_VER="3.3.0.0"; CABAL_VER_REGEXP="3\.3\.[0-9]"
# >= 3.3 && < 3.4
CABAL_VER="3.4.0.0"; CABAL_VER_REGEXP="3\.4\.[0-9]"
# >= 3.4 && < 3.5
TRANS_VER="0.5.5.0"; TRANS_VER_REGEXP="0\.[45]\."
# >= 0.2.* && < 0.6
MTL_VER="2.2.2"; MTL_VER_REGEXP="[2]\."
......
......@@ -4,7 +4,7 @@ Cabal-Version: >= 1.10
-- To update this file, edit 'cabal-install.cabal.pp' and run
-- 'make cabal-install-prod' in the project's root folder.
Name: cabal-install
Version: 3.3.0.0
Version: 3.4.0.0
Synopsis: The command-line interface for Cabal and Hackage.
Description:
The \'cabal\' command-line program simplifies the process of managing
......@@ -337,7 +337,7 @@ executable cabal
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.7.3 && < 0.9,
bytestring >= 0.10.6.0 && < 0.11,
Cabal == 3.3.*,
Cabal == 3.4.*,
containers >= 0.5.6.2 && < 0.7,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.4.1.1 && < 1.5,
......
......@@ -4,7 +4,7 @@ Cabal-Version: 2.0
-- To update this file, edit 'cabal-install.cabal.pp' and run
-- 'make cabal-install-prod' in the project's root folder.
Name: cabal-install
Version: 3.3.0.0
Version: 3.4.0.0
Synopsis: The command-line interface for Cabal and Hackage.
Description:
The \'cabal\' command-line program simplifies the process of managing
......@@ -331,7 +331,7 @@ library cabal-lib-client
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.7.3 && < 0.9,
bytestring >= 0.10.6.0 && < 0.11,
Cabal == 3.3.*,
Cabal == 3.4.*,
containers >= 0.5.6.2 && < 0.7,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.4.1.1 && < 1.5,
......
......@@ -4,7 +4,7 @@ Cabal-Version: >= 1.10
-- To update this file, edit 'cabal-install.cabal.pp' and run
-- 'make cabal-install-prod' in the project's root folder.
Name: cabal-install
Version: 3.3.0.0
Version: 3.4.0.0
Synopsis: The command-line interface for Cabal and Hackage.
Description:
The \'cabal\' command-line program simplifies the process of managing
......@@ -337,7 +337,7 @@ executable cabal
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.7.3 && < 0.9,
bytestring >= 0.10.6.0 && < 0.11,
Cabal == 3.3.*,
Cabal == 3.4.*,
containers >= 0.5.6.2 && < 0.7,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.4.1.1 && < 1.5,
......
......@@ -9,7 +9,7 @@ Cabal-Version: >= 1.10
-- To update this file, edit 'cabal-install.cabal.pp' and run
-- 'make cabal-install-prod' in the project's root folder.
Name: cabal-install
Version: 3.3.0.0
Version: 3.4.0.0
{# NOTE: when updating build-depends, don't forget to update version regexps in bootstrap.sh. #}
{% defblock buildDepends %}
build-depends:
......@@ -19,7 +19,7 @@ Version: 3.3.0.0
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.7.3 && < 0.9,
bytestring >= 0.10.6.0 && < 0.11,
Cabal == 3.3.*,
Cabal == 3.4.*,
containers >= 0.5.6.2 && < 0.7,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.4.1.1 && < 1.5,
......
......@@ -28,7 +28,7 @@ common shared
build-depends:
, base >= 4.6 && <4.15
-- this needs to match the in-tree lib:Cabal version
, Cabal == 3.3.0.0
, Cabal == 3.4.0.0
ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
......
set -e
CABAL_VERSION="3.3.0.0"
CABAL_INSTALL_VERSION="3.3.0.0"
CABAL_VERSION="3.4.0.0"
CABAL_INSTALL_VERSION="3.4.0.0"
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
ARCH="x86_64-linux"
......
......@@ -8,7 +8,7 @@ deploy() {
(cd cabal-website && git checkout --track -b gh-pages origin/gh-pages)
rm -rf cabal-website/doc
mkdir -p cabal-website/doc/html
mv dist-newstyle/build/`uname -m`-$TRAVIS_OS_NAME/ghc-$GHCVER/Cabal-3.3.0.0/doc/html/Cabal \
mv dist-newstyle/build/`uname -m`-$TRAVIS_OS_NAME/ghc-$GHCVER/Cabal-3.4.0.0/doc/html/Cabal \
cabal-website/doc/html/Cabal
(cd cabal-website && git add --all .)
(cd cabal-website && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment