...
 
Commits (4)
......@@ -73,3 +73,58 @@ jobs:
- 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.5.0.0\x\cabal\build\cabal\cabal.exe
test-windows-8_8_4:
name: test ghc-8.8.4
runs-on: windows-latest
steps:
- name: Install Cabal
run: choco install -fy cabal --version 3.2.0.0
- name: Install GHC
run: |
choco uninstall -y ghc --all-versions
choco install -y ghc --version 8.8.4
- 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.4\bin"
[Environment]::GetEnvironmentVariable("Path")
- name: Print versions
run: |
[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: windows-store-meta
- name: Update Hackage index
run: cabal v2-update
- uses: actions/checkout@v2
- name: make cabal-install-dev
run: cp cabal-install/cabal-install.cabal.dev cabal-install/cabal-install.cabal
# We cannot ask for all dependencies, but we can for Cabal.
- name: cabal v2-build Cabal --only-dependencies
run: cabal v2-build Cabal --only-dependencies
- name: cabal v2-build
run: cabal v2-build all
- name: cabal-install memory-usage-tests
run: |
cd cabal-install
cabal v2-run cabal-install:memory-usage-tests
- name: cabal-install solver-quickcheck
run: |
cd cabal-install
cabal v2-run cabal-install:solver-quickcheck
- name: cabal-install integration-tests2
run: |
cd cabal-install
cabal v2-run cabal-install:integration-tests2
- name: cabal-install unit-tests
run: |
cd cabal-install
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.8.4\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe
......@@ -28,6 +28,7 @@ data CabalSpecVersion
| CabalSpecV3_0
-- 3.2: no changes
| CabalSpecV3_4
| CabalSpecV3_6
deriving (Eq, Ord, Show, Read, Enum, Bounded, Typeable, Data, Generic)
instance Binary CabalSpecVersion
......@@ -38,6 +39,7 @@ instance NFData CabalSpecVersion where rnf = genericRnf
--
-- @since 3.0.0.0
showCabalSpecVersion :: CabalSpecVersion -> String
showCabalSpecVersion CabalSpecV3_6 = "3.6"
showCabalSpecVersion CabalSpecV3_4 = "3.4"
showCabalSpecVersion CabalSpecV3_0 = "3.0"
showCabalSpecVersion CabalSpecV2_4 = "2.4"
......@@ -56,7 +58,7 @@ showCabalSpecVersion CabalSpecV1_2 = "1.2"
showCabalSpecVersion CabalSpecV1_0 = "1.0"
cabalSpecLatest :: CabalSpecVersion
cabalSpecLatest = CabalSpecV3_4
cabalSpecLatest = CabalSpecV3_6
-- | Parse 'CabalSpecVersion' from version digits.
--
......@@ -64,6 +66,7 @@ cabalSpecLatest = CabalSpecV3_4
--
cabalSpecFromVersionDigits :: [Int] -> Maybe CabalSpecVersion
cabalSpecFromVersionDigits v
| v == [3,6] = Just CabalSpecV3_6
| v == [3,4] = Just CabalSpecV3_4
| v == [3,0] = Just CabalSpecV3_0
| v == [2,4] = Just CabalSpecV2_4
......@@ -84,6 +87,7 @@ cabalSpecFromVersionDigits v
-- | @since 3.4.0.0
cabalSpecToVersionDigits :: CabalSpecVersion -> [Int]
cabalSpecToVersionDigits CabalSpecV3_6 = [3,6]
cabalSpecToVersionDigits CabalSpecV3_4 = [3,4]
cabalSpecToVersionDigits CabalSpecV3_0 = [3,0]
cabalSpecToVersionDigits CabalSpecV2_4 = [2,4]
......
......@@ -14,6 +14,7 @@ data LicenseListVersion
deriving (Eq, Ord, Show, Enum, Bounded)
cabalSpecVersionToSPDXListVersion :: CabalSpecVersion -> LicenseListVersion
cabalSpecVersionToSPDXListVersion CabalSpecV3_6 = LicenseListVersion_3_9
cabalSpecVersionToSPDXListVersion CabalSpecV3_4 = LicenseListVersion_3_9
cabalSpecVersionToSPDXListVersion CabalSpecV3_0 = LicenseListVersion_3_6
cabalSpecVersionToSPDXListVersion CabalSpecV2_4 = LicenseListVersion_3_2
......
......@@ -24,7 +24,7 @@ tests = testGroup "Distribution.Utils.Structured"
, testCase "SPDX.License" $ structureHash (Proxy :: Proxy License) @?= md5FromInteger 0xd3d4a09f517f9f75bc3d16370d5a853a
-- The difference is in encoding of newtypes
#if MIN_VERSION_base(4,7,0)
, testCase "GenericPackageDescription" $ structureHash (Proxy :: Proxy GenericPackageDescription) @?= md5FromInteger 0x2f869c09d0cd2288d55b0455830e5a61
, testCase "LocalBuildInfo" $ structureHash (Proxy :: Proxy LocalBuildInfo) @?= md5FromInteger 0x2d64c99467083bef4a894162a121c467
, testCase "GenericPackageDescription" $ structureHash (Proxy :: Proxy GenericPackageDescription) @?= md5FromInteger 0x85108a50f7eef63ee549349b080548f3
, testCase "LocalBuildInfo" $ structureHash (Proxy :: Proxy LocalBuildInfo) @?= md5FromInteger 0xff0724263e69d314fc7cd327ca617264
#endif
]
......@@ -48,6 +48,7 @@ main = do
-- cabal-tests: fd:10: hClose: resource vanished (Broken pipe)
-- [ WinGhcJob "8.8.1" ["8.6.5"]
[ WinGhcJob "8.6.5" []
, WinGhcJob "8.8.4" []
]
, zMangleVersion = map mangleChar
, zOr = (||)
......
......@@ -19,6 +19,11 @@ relative to the respective preceding *published* version.
versions of the ``Cabal`` library denote unreleased development
branches which have no stability guarantee.
``cabal-version: 3.6``
----------------------
* TBW
``cabal-version: 3.4``
----------------------
......