Skip to content

Backport to 3.2 20200520 #6828

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
merged 3 commits into from
May 28, 2020
Merged

Backport to 3.2 20200520 #6828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bef3df0
Update dependency bounds
phadej May 20, 2020
2507056
Prepend hs-source-dir to match-component
fendor Mar 29, 2020
fc9adc9
Fix Windows GitHub Action
phadej May 22, 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
10 changes: 4 additions & 6 deletions .github/workflows/artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,12 @@ jobs:
name: Artifact on Windows
runs-on: windows-latest
steps:
- name: Configure Chocolatey
run: choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
- name: Install msys2
run: choco install -y msys2
- name: Install Cabal
run: choco install -y cabal --version 3.0.0.0
run: choco install -fy cabal --version 3.0.0.0
- name: Install GHC
run: choco install -y ghc --version 8.6.5
run: |
choco uninstall -y ghc
choco install -y ghc --version 8.6.5
- name: Set PATH
run: |
[Environment]::GetEnvironmentVariable("Path")
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,28 @@ jobs:
name: test ghc-8.6.5
runs-on: windows-latest
steps:
- name: Configure Chocolatey
run: choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
- name: Install msys2
run: choco install -y msys2
- name: Install Cabal
run: choco install -y cabal --version 3.2.0.0
run: choco install -fy cabal --version 3.2.0.0
- name: Install GHC
run: choco install -y ghc --version 8.6.5
run: |
choco uninstall -y ghc --all-versions
choco install -y ghc --version 8.6.5
- name: Set PATH
run: |
[Environment]::GetEnvironmentVariable("Path")
Write-Host "::add-path::C:\ProgramData\chocolatey\lib\cabal\tools\cabal-3.2.0.0"
Write-Host "::add-path::C:\ProgramData\chocolatey\lib\ghc\tools\ghc-8.6.5\bin"
Write-Host "::add-path::C:\ProgramData\Chocolatey\lib\cabal\tools\cabal-3.2.0.0"
Write-Host "::add-path::C:\ProgramData\Chocolatey\lib\ghc\tools\ghc-8.6.5\bin"
[Environment]::GetEnvironmentVariable("Path")
- name: Print versions
run: |
ghc --version
[Environment]::GetEnvironmentVariable("Path")
cabal --version
ghc --version
cabal user-config init -a "http-transport: plain-http" -a "store-dir: C:\SR" -f -v3
- uses: actions/cache@v1
with:
path: C:\SR
key: linux-store-meta
key: windows-store-meta
- name: Update Hackage index
run: cabal v2-update
- uses: actions/checkout@v2
Expand Down Expand Up @@ -79,28 +79,28 @@ jobs:
name: test ghc-8.8.3
runs-on: windows-latest
steps:
- name: Configure Chocolatey
run: choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
- name: Install msys2
run: choco install -y msys2
- name: Install Cabal
run: choco install -y cabal --version 3.2.0.0
run: choco install -fy cabal --version 3.2.0.0
- name: Install GHC
run: choco install -y ghc --version 8.8.3
run: |
choco uninstall -y ghc --all-versions
choco install -y ghc --version 8.8.3
- name: Set PATH
run: |
[Environment]::GetEnvironmentVariable("Path")
Write-Host "::add-path::C:\ProgramData\chocolatey\lib\cabal\tools\cabal-3.2.0.0"
Write-Host "::add-path::C:\ProgramData\chocolatey\lib\ghc\tools\ghc-8.8.3\bin"
Write-Host "::add-path::C:\ProgramData\Chocolatey\lib\cabal\tools\cabal-3.2.0.0"
Write-Host "::add-path::C:\ProgramData\Chocolatey\lib\ghc\tools\ghc-8.8.3\bin"
[Environment]::GetEnvironmentVariable("Path")
- name: Print versions
run: |
ghc --version
[Environment]::GetEnvironmentVariable("Path")
cabal --version
ghc --version
cabal user-config init -a "http-transport: plain-http" -a "store-dir: C:\SR" -f -v3
- uses: actions/cache@v1
with:
path: C:\SR
key: linux-store-meta
key: windows-store-meta
- name: Update Hackage index
run: cabal v2-update
- uses: actions/checkout@v2
Expand Down Expand Up @@ -135,28 +135,28 @@ jobs:
runs-on: windows-latest
needs: test-windows-8_8_3
steps:
- name: Configure Chocolatey
run: choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
- name: Install msys2
run: choco install -y msys2
- name: Install Cabal
run: choco install -y cabal --version 3.2.0.0
run: choco install -fy cabal --version 3.2.0.0
- name: Install GHC
run: choco install -y ghc --version 8.10.1
run: |
choco uninstall -y ghc --all-versions
choco install -y ghc --version 8.10.1
- name: Set PATH
run: |
[Environment]::GetEnvironmentVariable("Path")
Write-Host "::add-path::C:\ProgramData\chocolatey\lib\cabal\tools\cabal-3.2.0.0"
Write-Host "::add-path::C:\ProgramData\chocolatey\lib\ghc\tools\ghc-8.10.1\bin"
Write-Host "::add-path::C:\ProgramData\Chocolatey\lib\cabal\tools\cabal-3.2.0.0"
Write-Host "::add-path::C:\ProgramData\Chocolatey\lib\ghc\tools\ghc-8.10.1\bin"
[Environment]::GetEnvironmentVariable("Path")
- name: Print versions
run: |
ghc --version
[Environment]::GetEnvironmentVariable("Path")
cabal --version
ghc --version
cabal user-config init -a "http-transport: plain-http" -a "store-dir: C:\SR" -f -v3
- uses: actions/cache@v1
with:
path: C:\SR
key: linux-store-meta
key: windows-store-meta
- name: Update Hackage index
run: cabal v2-update
- uses: actions/checkout@v2
Expand Down
12 changes: 6 additions & 6 deletions Cabal/Cabal.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ library
filepath >= 1.3.0.1 && < 1.5,
pretty >= 1.1.1 && < 1.2,
process >= 1.1.0.2 && < 1.7,
time >= 1.4.0.1 && < 1.10
time >= 1.4.0.1 && < 1.11

if flag(bundled-binary-generic)
build-depends: binary >= 0.5.1.1 && < 0.7
Expand Down Expand Up @@ -635,15 +635,15 @@ test-suite unit-tests
directory,
filepath,
integer-logarithms >= 1.0.2 && <1.1,
tasty >= 1.2.3 && < 1.3,
tasty >= 1.2.3 && < 1.4,
tasty-hunit,
tasty-quickcheck,
tagged,
temporary,
text,
pretty,
Diff >=0.4 && <0.5,
QuickCheck >= 2.13.2 && < 2.14,
QuickCheck >= 2.14 && < 2.15,
Cabal
ghc-options: -Wall
default-language: Haskell2010
Expand All @@ -658,7 +658,7 @@ test-suite parser-tests
bytestring,
directory,
filepath,
tasty >= 1.2.3 && < 1.3,
tasty >= 1.2.3 && < 1.4,
tasty-hunit,
tasty-quickcheck,
tasty-golden >=2.3.1.1 && <2.4,
Expand Down Expand Up @@ -688,7 +688,7 @@ test-suite check-tests
bytestring,
directory,
filepath,
tasty >= 1.2.3 && < 1.3,
tasty >= 1.2.3 && < 1.4,
tasty-golden >=2.3.1.1 && <2.4,
Diff >=0.4 && <0.5,
Cabal
Expand Down Expand Up @@ -762,7 +762,7 @@ test-suite rpmvercmp
bytestring

build-depends:
tasty >= 1.2.3 && < 1.3,
tasty >= 1.2.3 && < 1.4,
tasty-hunit,
tasty-quickcheck,
QuickCheck
Expand Down
10 changes: 4 additions & 6 deletions boot/ci-artifacts.template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,12 @@ jobs:
name: Artifact on Windows
runs-on: windows-latest
steps:
- name: Configure Chocolatey
run: choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
- name: Install msys2
run: choco install -y msys2
- name: Install Cabal
run: choco install -y cabal --version 3.0.0.0
run: choco install -fy cabal --version 3.0.0.0
- name: Install GHC
run: choco install -y ghc --version 8.6.5
run: |
choco uninstall -y ghc
choco install -y ghc --version 8.6.5
- name: Set PATH
run: |
[Environment]::GetEnvironmentVariable("Path")
Expand Down
20 changes: 10 additions & 10 deletions boot/ci-windows.template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,28 +31,28 @@ jobs:
needs: test-windows-{{ mangleVersion needs }}
{% endfor %}
steps:
- name: Configure Chocolatey
run: choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
- name: Install msys2
run: choco install -y msys2
- name: Install Cabal
run: choco install -y cabal --version 3.2.0.0
run: choco install -fy cabal --version 3.2.0.0
- name: Install GHC
run: choco install -y ghc --version {{ job.version }}
run: |
choco uninstall -y ghc --all-versions
choco install -y ghc --version {{ job.version }}
- name: Set PATH
run: |
[Environment]::GetEnvironmentVariable("Path")
Write-Host "::add-path::C:\ProgramData\chocolatey\lib\cabal\tools\cabal-3.2.0.0"
Write-Host "::add-path::C:\ProgramData\chocolatey\lib\ghc\tools\ghc-{{ job.version }}\bin"
Write-Host "::add-path::C:\ProgramData\Chocolatey\lib\cabal\tools\cabal-3.2.0.0"
Write-Host "::add-path::C:\ProgramData\Chocolatey\lib\ghc\tools\ghc-{{ job.version }}\bin"
[Environment]::GetEnvironmentVariable("Path")
- name: Print versions
run: |
ghc --version
[Environment]::GetEnvironmentVariable("Path")
cabal --version
ghc --version
cabal user-config init -a "http-transport: plain-http" -a "store-dir: C:\SR" -f -v3
- uses: actions/cache@v1
with:
path: C:\SR
key: linux-store-meta
key: windows-store-meta
- name: Update Hackage index
run: cabal v2-update
- uses: actions/checkout@v2
Expand Down
12 changes: 7 additions & 5 deletions cabal-install/Distribution/Client/TargetSelector.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2117,12 +2117,14 @@ matchComponentOtherFile :: [KnownComponent] -> String
-> Match (FilePath, KnownComponent)
matchComponentOtherFile cs =
matchFile
[ (file, c)
| c <- cs
, file <- cinfoHsFiles c
++ cinfoCFiles c
++ cinfoJsFiles c
[ (normalise (srcdir </> file), c)
| c <- cs
, srcdir <- cinfoSrcDirs c
, file <- cinfoHsFiles c
++ cinfoCFiles c
++ cinfoJsFiles c
]
. normalise


matchComponentModuleFile :: [KnownComponent] -> String
Expand Down
4 changes: 2 additions & 2 deletions cabal-install/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ BINARY_VER="0.8.5.1"; BINARY_VER_REGEXP="[0]\.[78]\."
# >= 0.7 && < 0.9
TEXT_VER="1.2.3.0"; TEXT_VER_REGEXP="[1]\.[2]\."
# >= 1.2 && < 1.3
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_URI_VER="2.6.2.0"; NETWORK_URI_VER_REGEXP="2\.6\.2\."
# >= 2.6.2.0 && < 2.7
NETWORK_VER="2.7.0.0"; NETWORK_VER_REGEXP="2\.[0-7]\."
# >= 2.0 && < 2.7
CABAL_VER="3.2.0.0"; CABAL_VER_REGEXP="3\.2\.[0-9]"
Expand Down
6 changes: 4 additions & 2 deletions cabal-install/cabal-install.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@ Extra-Source-Files:
tests/IntegrationTests2/targets/multiple-tests/cabal.project
tests/IntegrationTests2/targets/multiple-tests/p.cabal
tests/IntegrationTests2/targets/simple/P.hs
tests/IntegrationTests2/targets/simple/app/Main.hs
tests/IntegrationTests2/targets/simple/cabal.project
tests/IntegrationTests2/targets/simple/p.cabal
tests/IntegrationTests2/targets/simple/q/Q.hs
tests/IntegrationTests2/targets/simple/q/QQ.hs
tests/IntegrationTests2/targets/simple/q/q.cabal
tests/IntegrationTests2/targets/test-only/p.cabal
Expand Down Expand Up @@ -331,14 +333,14 @@ executable cabal
hashable >= 1.0 && < 1.4,
HTTP >= 4000.1.5 && < 4000.4,
mtl >= 2.0 && < 2.3,
network-uri >= 2.6.0.2 && < 2.7,
network-uri >= 2.6.2.0 && < 2.7,
network >= 2.6 && < 3.2,
pretty >= 1.1 && < 1.2,
process >= 1.2.3.0 && < 1.7,
random >= 1 && < 1.2,
stm >= 2.0 && < 2.6,
tar >= 0.5.0.3 && < 0.6,
time >= 1.5.0.1 && < 1.10,
time >= 1.5.0.1 && < 1.11,
transformers >= 0.4.2.0 && < 0.6,
zlib >= 0.5.3 && < 0.7,
hackage-security >= 0.6.0.1 && < 0.7,
Expand Down
22 changes: 11 additions & 11 deletions cabal-install/cabal-install.cabal.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
hashable >= 1.0 && < 1.4,
HTTP >= 4000.1.5 && < 4000.4,
mtl >= 2.0 && < 2.3,
network-uri >= 2.6.0.2 && < 2.7,
network-uri >= 2.6.2.0 && < 2.7,
network >= 2.6 && < 3.2,
pretty >= 1.1 && < 1.2,
process >= 1.2.3.0 && < 1.7,
random >= 1 && < 1.2,
stm >= 2.0 && < 2.6,
tar >= 0.5.0.3 && < 0.6,
time >= 1.5.0.1 && < 1.10,
time >= 1.5.0.1 && < 1.11,
transformers >= 0.4.2.0 && < 0.6,
zlib >= 0.5.3 && < 0.7,
hackage-security >= 0.6.0.1 && < 0.7,
Expand Down Expand Up @@ -343,8 +343,10 @@
tests/IntegrationTests2/targets/multiple-tests/cabal.project
tests/IntegrationTests2/targets/multiple-tests/p.cabal
tests/IntegrationTests2/targets/simple/P.hs
tests/IntegrationTests2/targets/simple/app/Main.hs
tests/IntegrationTests2/targets/simple/cabal.project
tests/IntegrationTests2/targets/simple/p.cabal
tests/IntegrationTests2/targets/simple/q/Q.hs
tests/IntegrationTests2/targets/simple/q/QQ.hs
tests/IntegrationTests2/targets/simple/q/q.cabal
tests/IntegrationTests2/targets/test-only/p.cabal
Expand Down Expand Up @@ -462,7 +464,6 @@
UnitTests.Distribution.Client.ArbitraryInstances
UnitTests.Distribution.Client.FileMonitor
UnitTests.Distribution.Client.Get
UnitTests.Distribution.Client.GenericInstances
UnitTests.Distribution.Client.GZipUtils
UnitTests.Distribution.Client.Glob
UnitTests.Distribution.Client.IndexUtils.Timestamp
Expand Down Expand Up @@ -535,7 +536,6 @@
UnitTests.Distribution.Client.Targets
UnitTests.Distribution.Client.FileMonitor
UnitTests.Distribution.Client.Get
UnitTests.Distribution.Client.GenericInstances
UnitTests.Distribution.Client.Glob
UnitTests.Distribution.Client.GZipUtils
UnitTests.Distribution.Client.Sandbox
Expand Down Expand Up @@ -573,14 +573,14 @@
tar,
time,
zlib,
network-uri < 2.6.2.0,
network-uri >= 2.6.2.0 && <2.6.4.0,
network,
tasty >= 1.2.3 && <1.3,
tasty >= 1.2.3 && <1.4,
tasty-hunit >= 0.10,
tasty-quickcheck,
tagged,
tree-diff,
QuickCheck >= 2.8.2
QuickCheck >= 2.14 && <2.15

ghc-options: -threaded

Expand All @@ -607,7 +607,7 @@
containers,
deepseq,
tagged,
tasty >= 1.2.3 && <1.3,
tasty >= 1.2.3 && <1.4,
tasty-hunit >= 0.10

ghc-options: -threaded
Expand Down Expand Up @@ -636,9 +636,9 @@
hashable,
random,
tagged,
tasty >= 1.2.3 && <1.3,
tasty >= 1.2.3 && <1.4,
tasty-quickcheck,
QuickCheck >= 2.8.2,
QuickCheck >= 2.14 && <2.15,
pretty-show >= 1.6.15

ghc-options: -threaded
Expand All @@ -665,7 +665,7 @@
directory,
edit-distance,
filepath,
tasty >= 1.2.3 && <1.3,
tasty >= 1.2.3 && <1.4,
tasty-hunit >= 0.10,
tagged

Expand Down
Loading