Skip to content

Backport to 3.2 20201025 #7134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phadej merged 9 commits into from
Oct 25, 2020
Merged

Backport to 3.2 20201025 #7134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0981c6d
Use jobs when calling subprocesses
bgamari Feb 4, 2020
2e072ed
Add Distribution.Compat.Process module
phadej Feb 7, 2020
b861e40
Fix ghci being launched before other sources were built
lukel97 Jun 21, 2020
6bae128
Accept "linux-androideabi" as an alias for Android
Ericson2314 Oct 18, 2019
72a1347
Pass -optcxx for GHC >= 8.10
ejconlon Sep 14, 2020
1515a15
Resolve #7091: Require custom-setup for cabal-version: 1.24 and later
phadej Sep 27, 2020
246c88e
Fix #7126: Stricter checks for relative paths
phadej Oct 16, 2020
bf7be53
require cabal-versions >=1.25 to be exact
phadej Apr 5, 2020
3ccf5ba
Use actions/checkout@v2
phadej Oct 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker/validate-8.8.1.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ RUN cabal v2-install -w ghc-8.8.1 --lib \
# Validate
WORKDIR /build
COPY . /build
RUN sh ./validate.sh -w ghc-8.8.1 -v --doctest --solver-benchmarks
RUN sh ./validate.sh -w ghc-8.8.1 -v --doctest --solver-benchmarks --complete-hackage-tests
170 changes: 110 additions & 60 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ jobs:
- name: Set PATH
run: |
echo "::add-path::$HOME/.cabal/bin"
- name: Install git
run: |
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get install -y git
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
Expand All @@ -41,12 +46,12 @@ jobs:
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
# - uses: actions/checkout@v2
- name: Checkout
run: |
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
git fetch origin $GITHUB_REF:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- uses: actions/checkout@v2
# - name: Checkout
# - run: |
# - git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
# - git fetch origin $GITHUB_REF:temporary-ci-branch
# - git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s print-config
- name: Validate print-tool-versions
Expand All @@ -73,6 +78,11 @@ jobs:
- name: Set PATH
run: |
echo "::add-path::$HOME/.cabal/bin"
- name: Install git
run: |
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get install -y git
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
Expand All @@ -84,12 +94,12 @@ jobs:
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
# - uses: actions/checkout@v2
- name: Checkout
run: |
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
git fetch origin $GITHUB_REF:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- uses: actions/checkout@v2
# - name: Checkout
# - run: |
# - git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
# - git fetch origin $GITHUB_REF:temporary-ci-branch
# - git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s print-config
- name: Validate print-tool-versions
Expand Down Expand Up @@ -117,6 +127,11 @@ jobs:
- name: Set PATH
run: |
echo "::add-path::$HOME/.cabal/bin"
- name: Install git
run: |
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get install -y git
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
Expand All @@ -128,12 +143,12 @@ jobs:
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
# - uses: actions/checkout@v2
- name: Checkout
run: |
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
git fetch origin $GITHUB_REF:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- uses: actions/checkout@v2
# - name: Checkout
# - run: |
# - git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
# - git fetch origin $GITHUB_REF:temporary-ci-branch
# - git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-8.6.5 -v --complete-hackage-tests -s print-config
- name: Validate print-tool-versions
Expand Down Expand Up @@ -161,6 +176,11 @@ jobs:
- name: Set PATH
run: |
echo "::add-path::$HOME/.cabal/bin"
- name: Install git
run: |
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get install -y git
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
Expand All @@ -172,12 +192,12 @@ jobs:
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
# - uses: actions/checkout@v2
- name: Checkout
run: |
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
git fetch origin $GITHUB_REF:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- uses: actions/checkout@v2
# - name: Checkout
# - run: |
# - git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
# - git fetch origin $GITHUB_REF:temporary-ci-branch
# - git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-8.4.4 -v -s print-config
- name: Validate print-tool-versions
Expand Down Expand Up @@ -205,6 +225,11 @@ jobs:
- name: Set PATH
run: |
echo "::add-path::$HOME/.cabal/bin"
- name: Install git
run: |
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get install -y git
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
Expand All @@ -216,12 +241,12 @@ jobs:
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
# - uses: actions/checkout@v2
- name: Checkout
run: |
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
git fetch origin $GITHUB_REF:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- uses: actions/checkout@v2
# - name: Checkout
# - run: |
# - git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
# - git fetch origin $GITHUB_REF:temporary-ci-branch
# - git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-8.2.2 -v -s print-config
- name: Validate print-tool-versions
Expand Down Expand Up @@ -249,6 +274,11 @@ jobs:
- name: Set PATH
run: |
echo "::add-path::$HOME/.cabal/bin"
- name: Install git
run: |
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get install -y git
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
Expand All @@ -260,12 +290,12 @@ jobs:
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
# - uses: actions/checkout@v2
- name: Checkout
run: |
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
git fetch origin $GITHUB_REF:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- uses: actions/checkout@v2
# - name: Checkout
# - run: |
# - git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
# - git fetch origin $GITHUB_REF:temporary-ci-branch
# - git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-8.0.2 -v -s print-config
- name: Validate print-tool-versions
Expand Down Expand Up @@ -293,6 +323,11 @@ jobs:
- name: Set PATH
run: |
echo "::add-path::$HOME/.cabal/bin"
- name: Install git
run: |
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get install -y git
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
Expand All @@ -304,12 +339,12 @@ jobs:
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
# - uses: actions/checkout@v2
- name: Checkout
run: |
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
git fetch origin $GITHUB_REF:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- uses: actions/checkout@v2
# - name: Checkout
# - run: |
# - git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
# - git fetch origin $GITHUB_REF:temporary-ci-branch
# - git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-7.10.3 -v -s print-config
- name: Validate print-tool-versions
Expand Down Expand Up @@ -337,6 +372,11 @@ jobs:
- name: Set PATH
run: |
echo "::add-path::$HOME/.cabal/bin"
- name: Install git
run: |
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get install -y git
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
Expand All @@ -348,12 +388,12 @@ jobs:
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
# - uses: actions/checkout@v2
- name: Checkout
run: |
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
git fetch origin $GITHUB_REF:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- uses: actions/checkout@v2
# - name: Checkout
# - run: |
# - git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
# - git fetch origin $GITHUB_REF:temporary-ci-branch
# - git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-7.8.4 -v --lib-only -s print-config
- name: Validate print-tool-versions
Expand All @@ -375,6 +415,11 @@ jobs:
- name: Set PATH
run: |
echo "::add-path::$HOME/.cabal/bin"
- name: Install git
run: |
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get install -y git
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
Expand All @@ -390,12 +435,12 @@ jobs:
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
# - uses: actions/checkout@v2
- name: Checkout
run: |
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
git fetch origin $GITHUB_REF:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- uses: actions/checkout@v2
# - name: Checkout
# - run: |
# - git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
# - git fetch origin $GITHUB_REF:temporary-ci-branch
# - git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-7.6.3 -v --lib-only -s print-config
- name: Validate print-tool-versions
Expand All @@ -417,6 +462,11 @@ jobs:
- name: Set PATH
run: |
echo "::add-path::$HOME/.cabal/bin"
- name: Install git
run: |
add-apt-repository -y ppa:git-core/ppa
apt-get update
apt-get install -y git
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
Expand All @@ -434,12 +484,12 @@ jobs:
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
# - uses: actions/checkout@v2
- name: Checkout
run: |
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
git fetch origin $GITHUB_REF:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- uses: actions/checkout@v2
# - name: Checkout
# - run: |
# - git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
# - git fetch origin $GITHUB_REF:temporary-ci-branch
# - git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s print-config
- name: Validate print-tool-versions
Expand Down
3 changes: 3 additions & 0 deletions Cabal/Cabal.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ extra-source-files:
tests/ParserTests/regressions/common3.format
tests/ParserTests/regressions/cxx-options-with-optimization.cabal
tests/ParserTests/regressions/cxx-options-with-optimization.check
tests/ParserTests/regressions/denormalised-paths.cabal
tests/ParserTests/regressions/denormalised-paths.check
tests/ParserTests/regressions/elif.cabal
tests/ParserTests/regressions/elif.expr
tests/ParserTests/regressions/elif.format
Expand Down Expand Up @@ -334,6 +336,7 @@ library
Distribution.Compat.Newtype
Distribution.Compat.ResponseFile
Distribution.Compat.Prelude.Internal
Distribution.Compat.Process
Distribution.Compat.Semigroup
Distribution.Compat.Stack
Distribution.Compat.Time
Expand Down
15 changes: 15 additions & 0 deletions Cabal/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,21 @@
# 3.0.1.0 [Herbert Valerio Riedel](mailto:hvr@gnu.org) April 2020
* Add GHC-8.8 flags to `normaliseGhcFlags`
([#6379](https://github.com/haskell/cabal/pull/6379)).
`Language.Haskell.Extension`
* Use more `NonEmpty` instead of ordinary lists
* Add `Distribution.Utils.Structured` for fingeprinting `Binary` blobs
* Add `null`, `length` and `unsafeFromUTF8BS` to `Distribution.Utils.ShortText`
* Refactor `Distribution.Utils.IOData` module
* Rename `Distribution.Compat.MD5` to `Distribution.Utils.MD5`
* Add `safeHead`, `safeTail`, `safeLast` to `Distribution.Utils.Generic`
* Add `unsnoc` and `unsnocNE` to `Distribution.Utils.Generic`
* Add `Set'` modifier to `Distribution.Parsec.Newtypes`
* Add `Distribution.Compat.Async`
* Add `Distribution.Compat.Process` with `enableProcessJobs`

# 3.0.1.0 TBW
* Add GHC-8.8 flags to normaliseGhcFlags
([#6379](https://github.com/haskell/cabal/pull/6379))
* Typo fixes
([#6372](https://github.com/haskell/cabal/pull/6372)).
* Limit version number parts to contain at most 9 digits
Expand Down
Loading