From 239dfd24936178fa99e1fb9064869b9d699154af Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Tue, 16 Aug 2022 13:52:09 +0200 Subject: [PATCH 1/2] Exclude CI job 8.10.7 on Windows that corrupts all CI --- .github/workflows/validate.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 3401a20a920..184a0bc28ba 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -40,6 +40,9 @@ jobs: os: ["ubuntu-latest", "macos-latest", "windows-latest"] ghc: ["9.2.3", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"] exclude: + # corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356 + - os: "windows-latest" + ghc: "8.10.7" # lot of segfaults caused by ghc bugs - os: "windows-latest" ghc: "8.8.4" From c68ed017512a6523f8cc81f7bddf2af935a65147 Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Tue, 16 Aug 2022 15:44:21 +0200 Subject: [PATCH 2/2] Revert "Turn off DeterministicTrivial test (see #8356)" This reverts commit cd7a91281c72c1b4587c155264180307646ce36f. It's not needed any more, probably, because another workaround fixes CI differently, probably. As long as it's deterministic enough... --- .../DeterministicTrivial/deterministic.test.hs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/cabal-testsuite/PackageTests/NewSdist/DeterministicTrivial/deterministic.test.hs b/cabal-testsuite/PackageTests/NewSdist/DeterministicTrivial/deterministic.test.hs index 67c2944b39c..64b0a329a95 100644 --- a/cabal-testsuite/PackageTests/NewSdist/DeterministicTrivial/deterministic.test.hs +++ b/cabal-testsuite/PackageTests/NewSdist/DeterministicTrivial/deterministic.test.hs @@ -1,13 +1,10 @@ import Test.Cabal.Prelude import qualified Data.ByteString as BS --- import qualified Data.ByteString.Base16 as BS16 --- import qualified Crypto.Hash.SHA256 as SHA256 +import qualified Data.ByteString.Base16 as BS16 +import qualified Crypto.Hash.SHA256 as SHA256 import System.FilePath ( () ) - -- Note: we cannot simply use `expectBroken` or `skip` or similar - -- becuase this test fails on imports (see #8357). - main = cabalTest $ do cabal "v2-sdist" ["deterministic"] env <- getTestEnv @@ -24,6 +21,4 @@ main = cabalTest $ do known <- liftIO (BS.readFile knownSdist) unknown <- liftIO (BS.readFile mySdist) - skipIf "#8356" True -- bogus, just to indicate that the test is skipped - assertEqual "hashes didn't match for sdist" True True - -- assertEqual "hashes didn't match for sdist" (BS16.encode $ SHA256.hash known) (BS16.encode $ SHA256.hash unknown) + assertEqual "hashes didn't match for sdist" (BS16.encode $ SHA256.hash known) (BS16.encode $ SHA256.hash unknown)