fixup: remove hackage mirror

composewell · Dec 14, 2023 · ba1b137 · ba1b137
1 parent 40fe5f3
commit ba1b137
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -38,7 +38,6 @@ env: &env
       # ------------------------------------------------------------------------
       CABAL_CHECK_RELAX: "y"
       CABAL_NO_SANDBOX: "y"
-      CABAL_HACKAGE_MIRROR: "hackage.haskell.org:http://hackage.fpcomplete.com"
 
       # ------------------------------------------------------------------------
       # Where to find the required tools
@@ -147,7 +146,7 @@ jobs:
              BUILD: "cabal-v2"
              CABAL_PROJECT: "cabal.project.ci"
              CABAL_BUILD_OPTIONS: "--flag fusion-plugin"
-             CABALVER: "3.10.1.0"
+             CABALVER: "3.10.2.0"
              GHCVER: "9.8.1"
            <<: *preinstall
         - *save

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -17,7 +17,6 @@ jobs:
 
       CABAL_CHECK_RELAX: y
       CABAL_NO_SANDBOX: y
-      CABAL_HACKAGE_MIRROR: hackage.haskell.org:http://hackage.fpcomplete.com
 
       PACKCHECK_LOCAL_PATH: "./packcheck.sh"
       PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
@@ -32,35 +31,38 @@ jobs:
       DISABLE_TEST: "y"
       DISABLE_BENCH: "y"
 
+    # XXX macos?
     runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-          - name: 8.10.7+macOS
-            ghc_version: 8.10.7
+          - name: 9.4.4
+            ghc_version: 9.4.4
+            runner: ubuntu-latest
             build: cabal
             cabal_project: cabal.project.user
-            cabal_version: 3.6.2.0
+            cabal_version: 3.8.1.0
             disable_docs: "y"
-            cabal_build_options: "--flag interop"
-          - name: 9.2.7.Werror
+            disable_sdist_build: "y"
+            ignore_error: false
+          - name: 9.2.7
             ghc_version: 9.2.7
             runner: ubuntu-latest
             build: cabal
-            cabal_project: cabal.project.Werror
+            cabal_project: cabal.project.user
             cabal_version: 3.6.2.0
             disable_docs: "y"
             disable_sdist_build: "y"
             ignore_error: false
-          - name: 9.4.4
-            ghc_version: 9.4.4
-            runner: ubuntu-latest
+          - name: 8.10.7+macOS
+            ghc_version: 8.10.7
+            runner: macos-latest
             build: cabal
             cabal_project: cabal.project.user
-            cabal_version: 3.8.1.0
+            cabal_version: 3.6.2.0
             disable_docs: "y"
-            disable_sdist_build: "y"
+            cabal_build_options: "--flag interop"
             ignore_error: false
     steps:
     - uses: actions/checkout@v2

diff --git a/appveyor.yml b/appveyor.yml
@@ -46,7 +46,6 @@ environment:
     CABAL_BUILD_OPTIONS: "--flag interop"
     CABAL_CHECK_RELAX: "y"
     CABAL_NO_SANDBOX: "y"
-    CABAL_HACKAGE_MIRROR: "hackage.haskell.org:http://hackage.fpcomplete.com"
 
     # ------------------------------------------------------------------------
     # Where to find the required tools