Remove FreeBSD workaround in CI

Add Alpine GHC 8.4.4 for 64bit
Set 8.8.4 as recommended GHC version
2020-07-21 19:00:10 +02:00 · 2020-07-21 01:18:03 +02:00 · 2020-07-21 00:31:02 +02:00 · 2020-07-21 00:29:46 +02:00 · 2020-07-21 00:02:14 +02:00 · 2020-07-20 23:57:26 +02:00
5 changed files with 96 additions and 45 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,7 +113,7 @@ test:linux:latest:
 test:mac:recommended:
  extends: .test_ghcup_version:darwin
  variables:
-    GHC_VERSION: "8.8.3"
+    GHC_VERSION: "8.8.4"
    CABAL_VERSION: "3.2.0.0"

 test:mac:latest:
@@ -129,7 +129,7 @@ test:mac:latest:
 test:freebsd:recommended:
  extends: .test_ghcup_version:freebsd
  variables:
-    GHC_VERSION: "8.8.3"
+    GHC_VERSION: "8.8.4"
    CABAL_VERSION: "3.2.0.0"

 test:freebsd:latest:
@@ -162,7 +162,7 @@ release:linux:32bit:
    - ./.gitlab/before_script/linux/alpine/install_deps.sh
  variables:
    ARTIFACT: "i386-linux-ghcup"
-    GHC_VERSION: "8.6.5"
+    GHC_VERSION: "8.8.4"
    CABAL_VERSION: "3.2.0.0"


--- a/.gitlab/script/ghcup_version.sh
+++ b/.gitlab/script/ghcup_version.sh
@@ -44,12 +44,6 @@ ghcup-gen check -f ghcup-${JSON_VERSION}.json

 eghcup --numeric-version

-# TODO: rm once we have tarballs
-if [ "${OS}"  = "FREEBSD" ] ; then
-	GHC_VERSION=8.6.3
-	CABAL_VERSION=2.4.1.0
-fi
-
 eghcup install ${GHC_VERSION}
 eghcup set ${GHC_VERSION}
 eghcup install-cabal ${CABAL_VERSION}
--- a/2
+++ b/2
@@ -28,7 +28,7 @@ eghcup() {
 download_ghcup() {
 	_plat="$(uname -s)"
 	_arch=$(uname -m)
-	_ghver="0.1.6"
+	_ghver="0.1.7"
 	_base_url="https://downloads.haskell.org/~ghcup"

    case "${_plat}" in
--- a/ghcup-0.0.2.json
+++ b/ghcup-0.0.2.json
@@ -214,7 +214,7 @@
          "A_64": {
            "Linux_Alpine": {
              "unknown_versioning": {
-                "dlHash": "325b48b2ea199b4f62c16dc9c3ff99b42ea6bb1dde5a74fa640dfeb8d63894d0",
+                "dlHash": "517783b660a27ebf95b2568d47292fd633d5f9a4de4c80ad1ccf05e1b9d7313f",
                "dlSubdir": "ghc-8.0.2",
                "dlUri": "https://files.hasufell.de/ghc/ghc-8.0.2-x86_64-alpine-linux.tar.xz"
              }
@@ -744,6 +744,13 @@
            }
          },
          "A_32": {
+            "Linux_Alpine": {
+              "unknown_versioning": {
+                "dlHash": "7360cc6b29e9b4ab08f6ea5bc3bcca6f5c216933e81ef1620dcdd700f1fdb289",
+                "dlSubdir": "ghc-8.10.1",
+                "dlUri": "https://files.hasufell.de/ghc/ghc-8.10.1-i386-alpine-linux.tar.xz"
+              }
+            },
            "Linux_Debian": {
              "unknown_versioning": {
                "dlHash": "8b53eef2c827b5f634d72920a93c0c9dd66ea288691a2bfe28def45d3c686ee2",
@@ -1263,6 +1270,13 @@
            }
          },
          "A_32": {
+            "Linux_Alpine": {
+              "unknown_versioning": {
+                "dlHash": "1d18e89ee031197e55c48683e78a7ffc67601ac5fd9f73aac555eb064b3859a2",
+                "dlSubdir": "ghc-8.8.4",
+                "dlUri": "https://files.hasufell.de/ghc/ghc-8.8.4-i386-alpine-linux.tar.xz"
+              }
+            },
            "Linux_Debian": {
              "unknown_versioning": {
                "dlHash": "43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0",
@@ -1300,6 +1314,7 @@
        },
        "viChangeLog": "https://downloads.haskell.org/~ghc/8.8.4/docs/html/users_guide/8.8.4-notes.html",
        "viTags": [
+          "Recommended",
          "base-4.13.0.0"
        ]
      },
@@ -1762,6 +1777,13 @@
      "8.2.2": {
        "viArch": {
          "A_64": {
+            "Linux_Alpine": {
+              "unknown_versioning": {
+                "dlHash": "adcf3a320a3c402aba07ae9586990dc3c0b550e96aeffb1b9e194313d3ba716d",
+                "dlSubdir": "ghc-8.2.2",
+                "dlUri": "https://files.hasufell.de/ghc/ghc-8.2.2-x86_64-alpine-linux.tar.xz"
+              }
+            },
            "FreeBSD": {
              "unknown_versioning": {
                "dlHash": "cd351c704b92b9af23994024df07de8ca7090ea7675d5c8b14b2be857a46d804",
@@ -1876,6 +1898,13 @@
      "8.4.4": {
        "viArch": {
          "A_64": {
+            "Linux_Alpine": {
+              "unknown_versioning": {
+                "dlHash": "336affff8314d3dc5e85d9c09015ae2ba8a7658b459c8c8ae77ecaa551a56ae7",
+                "dlSubdir": "ghc-8.4.4",
+                "dlUri": "https://files.hasufell.de/ghc/ghc-8.4.4-x86_64-alpine-linux.tar.xz"
+              }
+            },
            "FreeBSD": {
              "unknown_versioning": {
                "dlHash": "44fbd142d1c355d6110595c59c760e2c73866ff9259ec85ebf814edb244d1940",
@@ -2137,7 +2166,6 @@
        },
        "viChangeLog": "https://downloads.haskell.org/~ghc/8.8.3/docs/html/users_guide/8.8.3-notes.html",
        "viTags": [
-          "Recommended",
          "base-4.13.0.0"
        ]
      }
@@ -2312,37 +2340,37 @@
      }
    },
    "GHCup": {
-      "0.1.6": {
+      "0.1.7": {
        "viArch": {
          "A_64": {
            "FreeBSD": {
              "unknown_versioning": {
-                "dlHash": "6bbfb1047691ff3ae9249e8805cf9f37bab30a008dae130cb2a4b3aa5253e6e5",
+                "dlHash": "54b9b6f98908f6679dda6db025b4047dfe82e6b57ae82c547a9d611b9e4ff105",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.7/x86_64-portbld-freebsd-ghcup-0.1.7"
              }
            },
            "Darwin": {
              "unknown_versioning": {
-                "dlHash": "1e025e66d7f7b75d94f17a7da6120efd7e2df918a8eac88c4711ed11d2aac4ec",
+                "dlHash": "00b2c04755d2b40e568afbfc2a485c36697fc55f210eae0d4cd80413c71032ed",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.7/x86_64-apple-darwin-ghcup-0.1.7"
              }
            },
            "Linux_UnknownLinux": {
              "unknown_versioning": {
-                "dlHash": "bdbec0cdf4c8511c4082dd83993d15034c0fbcb5722ecf418c1cee40667da8af",
+                "dlHash": "a1d1e8b3c2b00186957c927d09f2cfb457bbfa65c1ab562ff5683963e205bdd5",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-linux-ghcup-0.1.6"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.7/x86_64-linux-ghcup-0.1.7"
              }
            }
          },
          "A_32": {
            "Linux_UnknownLinux": {
              "unknown_versioning": {
-                "dlHash": "0366ed6c00862c3c002cdefc3e37523ad80e655387956c7ab58b268aaa6fae5d",
+                "dlHash": "1651cc196e4fdd18995054edebe109833535961f0e2b0d505f1714e83f3e8808",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/i386-linux-ghcup-0.1.6"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.7/i386-linux-ghcup-0.1.7"
              }
            }
          }
--- a/lib/GHCup/Data/GHCupDownloads.hs
+++ b/lib/GHCup/Data/GHCupDownloads.hs
@@ -110,7 +110,7 @@ ghc_802_64_alpine :: DownloadInfo
 ghc_802_64_alpine = DownloadInfo
  [uri|https://files.hasufell.de/ghc/ghc-8.0.2-x86_64-alpine-linux.tar.xz|]
  (Just [rel|ghc-8.0.2|])
-  "325b48b2ea199b4f62c16dc9c3ff99b42ea6bb1dde5a74fa640dfeb8d63894d0"
+  "517783b660a27ebf95b2568d47292fd633d5f9a4de4c80ad1ccf05e1b9d7313f"

 ghc_802_32_alpine :: DownloadInfo
 ghc_802_32_alpine = DownloadInfo
@@ -180,6 +180,13 @@ ghc_822_32_alpine = DownloadInfo
  (Just [rel|ghc-8.2.2|])
  "467534c32552cfd318753112dbc70af003693aad4b0081f2a07e61f5b5ea2c22"

+ghc_822_64_alpine :: DownloadInfo
+ghc_822_64_alpine = DownloadInfo
+  [uri|https://files.hasufell.de/ghc/ghc-8.2.2-x86_64-alpine-linux.tar.xz|]
+  (Just [rel|ghc-8.2.2|])
+  "adcf3a320a3c402aba07ae9586990dc3c0b550e96aeffb1b9e194313d3ba716d"
+
+


    -----------------
@@ -358,6 +365,12 @@ ghc_844_32_alpine = DownloadInfo
  (Just [rel|ghc-8.4.4|])
  "892888d388ef5c9cadf5cfba1146d62237c25b9b066fb62fee940b2b285fd308"

+ghc_844_64_alpine :: DownloadInfo
+ghc_844_64_alpine = DownloadInfo
+  [uri|https://files.hasufell.de/ghc/ghc-8.4.4-x86_64-alpine-linux.tar.xz|]
+  (Just [rel|ghc-8.4.4|])
+  "336affff8314d3dc5e85d9c09015ae2ba8a7658b459c8c8ae77ecaa551a56ae7"
+


    -----------------
@@ -782,6 +795,13 @@ ghc_884_64_alpine = DownloadInfo
  (Just [rel|ghc-8.8.4|])
  "90c6a1661de7f20c7d169cd6270125035b3332063e45103ce028df0beecf434e"

+ghc_884_32_alpine :: DownloadInfo
+ghc_884_32_alpine = DownloadInfo
+  [uri|https://files.hasufell.de/ghc/ghc-8.8.4-i386-alpine-linux.tar.xz|]
+  (Just [rel|ghc-8.8.4|])
+  "1d18e89ee031197e55c48683e78a7ffc67601ac5fd9f73aac555eb064b3859a2"
+
+


    -----------------
@@ -838,6 +858,11 @@ ghc_8101_64_alpine = DownloadInfo
  (Just [rel|ghc-8.10.1-x86_64-unknown-linux|])
  "cb13b645d103e2fba2eb8dfcc4e5f2fbd9550c00c4df42f342b4210436dcb8a8"

+ghc_8101_32_alpine :: DownloadInfo
+ghc_8101_32_alpine = DownloadInfo
+  [uri|https://files.hasufell.de/ghc/ghc-8.10.1-i386-alpine-linux.tar.xz|]
+  (Just [rel|ghc-8.10.1|])
+  "7360cc6b29e9b4ab08f6ea5bc3bcca6f5c216933e81ef1620dcdd700f1fdb289"

 ghc_8101_64_freebsd :: DownloadInfo
 ghc_8101_64_freebsd = DownloadInfo
@@ -977,32 +1002,32 @@ cabal_3200_64_alpine = DownloadInfo
    -------------


-ghcup_016_32_linux :: DownloadInfo
-ghcup_016_32_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.6/i386-linux-ghcup-0.1.6|]
+ghcup_017_32_linux :: DownloadInfo
+ghcup_017_32_linux = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.7/i386-linux-ghcup-0.1.7|]
  Nothing
-  "0366ed6c00862c3c002cdefc3e37523ad80e655387956c7ab58b268aaa6fae5d"
+  "1651cc196e4fdd18995054edebe109833535961f0e2b0d505f1714e83f3e8808"


-ghcup_016_64_linux :: DownloadInfo
-ghcup_016_64_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-linux-ghcup-0.1.6|]
+ghcup_017_64_linux :: DownloadInfo
+ghcup_017_64_linux = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.7/x86_64-linux-ghcup-0.1.7|]
  Nothing
-  "bdbec0cdf4c8511c4082dd83993d15034c0fbcb5722ecf418c1cee40667da8af"
+  "a1d1e8b3c2b00186957c927d09f2cfb457bbfa65c1ab562ff5683963e205bdd5"


-ghcup_016_64_freebsd :: DownloadInfo
-ghcup_016_64_freebsd = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6|]
+ghcup_017_64_freebsd :: DownloadInfo
+ghcup_017_64_freebsd = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.7/x86_64-portbld-freebsd-ghcup-0.1.7|]
  Nothing
-  "6bbfb1047691ff3ae9249e8805cf9f37bab30a008dae130cb2a4b3aa5253e6e5"
+  "54b9b6f98908f6679dda6db025b4047dfe82e6b57ae82c547a9d611b9e4ff105"


-ghcup_016_64_darwin10_13 :: DownloadInfo
-ghcup_016_64_darwin10_13 = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6|]
+ghcup_017_64_darwin10_13 :: DownloadInfo
+ghcup_017_64_darwin10_13 = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.7/x86_64-apple-darwin-ghcup-0.1.7|]
  Nothing
-  "1e025e66d7f7b75d94f17a7da6120efd7e2df918a8eac88c4711ed11d2aac4ec"
+  "00b2c04755d2b40e568afbfc2a485c36697fc55f210eae0d4cd80413c71032ed"



@@ -1141,6 +1166,7 @@ ghcupDownloads = M.fromList
                      , (Just [vers|11|], ghc_822_64_freebsd11)
                      ]
                    )
+                  , (Linux Alpine , M.fromList [(Nothing, ghc_822_64_alpine)])
                  ]
                )
              , ( A_32
@@ -1332,6 +1358,7 @@ ghcupDownloads = M.fromList
                    )
                  , (Darwin      , M.fromList [(Nothing, ghc_844_64_darwin)])
                  , (FreeBSD     , M.fromList [(Nothing, ghc_844_64_freebsd)])
+                  , (Linux Alpine, M.fromList [(Nothing, ghc_844_64_alpine)])
                  ]
                )
              , ( A_32
@@ -1698,7 +1725,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.8.3|]
        , VersionInfo
-            [Recommended, Base [pver|4.13.0.0|]]
+            [Base [pver|4.13.0.0|]]
            (Just
              [uri|https://downloads.haskell.org/~ghc/8.8.3/docs/html/users_guide/8.8.3-notes.html|]
            )
@@ -1751,7 +1778,7 @@ ghcupDownloads = M.fromList
        )
      , ( [vver|8.8.4|]
        , VersionInfo
-            [Base [pver|4.13.0.0|]]
+            [Recommended, Base [pver|4.13.0.0|]]
            (Just
              [uri|https://downloads.haskell.org/~ghc/8.8.4/docs/html/users_guide/8.8.4-notes.html|]
            )
@@ -1799,6 +1826,7 @@ ghcupDownloads = M.fromList
                  , (Linux Ubuntu, M.fromList [(Nothing, ghc_884_32_deb9)])
                  , (Linux Mint  , M.fromList [(Nothing, ghc_884_32_deb9)])
                  , (Linux Debian, M.fromList [(Nothing, ghc_884_32_deb9)])
+                  , (Linux Alpine, M.fromList [(Nothing, ghc_884_32_alpine)])
                  ]
                )
              ]
@@ -1869,6 +1897,7 @@ ghcupDownloads = M.fromList
                      , (Just [vers|9|], ghc_8101_32_deb9)
                      ]
                    )
+                  , (Linux Alpine, M.fromList [(Nothing, ghc_8101_32_alpine)])
                  ]
                )
              ]
@@ -1976,7 +2005,7 @@ ghcupDownloads = M.fromList
    )
  , ( GHCup
    , M.fromList
-      [ ( [vver|0.1.6|]
+      [ ( [vver|0.1.7|]
        , VersionInfo
            [Recommended, Latest]
            (Just
@@ -1987,16 +2016,16 @@ ghcupDownloads = M.fromList
              [ ( A_64
                , M.fromList
                  [ ( Linux UnknownLinux
-                    , M.fromList [(Nothing, ghcup_016_64_linux)]
+                    , M.fromList [(Nothing, ghcup_017_64_linux)]
                    )
-                  , (Darwin , M.fromList [(Nothing, ghcup_016_64_darwin10_13)])
-                  , (FreeBSD, M.fromList [(Nothing, ghcup_016_64_freebsd)])
+                  , (Darwin , M.fromList [(Nothing, ghcup_017_64_darwin10_13)])
+                  , (FreeBSD, M.fromList [(Nothing, ghcup_017_64_freebsd)])
                  ]
                )
              , ( A_32
                , M.fromList
                  [ ( Linux UnknownLinux
-                    , M.fromList [(Nothing, ghcup_016_32_linux)]
+                    , M.fromList [(Nothing, ghcup_017_32_linux)]
                    )
                  ]
                )
Author	SHA1	Message	Date
Julian Ospald	a298d949b5	Remove FreeBSD workaround in CI	2020-07-21 19:00:10 +02:00
Julian Ospald	e1cf11f9d4	Add Alpine GHC 8.4.4 for 64bit	2020-07-21 01:18:03 +02:00
Julian Ospald	97cd43792d	Set 8.8.4 as recommended GHC version	2020-07-21 00:31:02 +02:00
Julian Ospald	08693e6d3a	Add more alpine bindists	2020-07-21 00:29:46 +02:00
Julian Ospald	e2227da8d2	Update ghcup binaries	2020-07-21 00:02:14 +02:00
Julian Ospald	5f20e4c583	Bump versions in CI	2020-07-20 23:57:26 +02:00
Julian Ospald	f82f1a12dd	Update version in bootstrap-script	2020-07-20 23:04:11 +02:00