[Git][ghc/ghc][wip/freebsd-ci] 2 commits: gitlab-ci: XXX temporary GHC bindist on FreeBSD

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/freebsd-ci at Glasgow Haskell Compiler / GHC


Commits:
532da1a5 by Ben Gamari at 2022-08-07T23:51:56-04:00
gitlab-ci: XXX temporary GHC bindist on FreeBSD

- - - - -
0135b58c by Ben Gamari at 2022-08-07T23:52:07-04:00
Update jobs.yaml

- - - - -


3 changed files:

- .gitlab/ci.sh
- .gitlab/gen_ci.hs
- .gitlab/jobs.yaml


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -278,6 +278,9 @@ function fetch_ghc() {
 
       start_section "fetch GHC"
       url="https://downloads.haskell.org/~ghc/${GHC_VERSION}/ghc-${GHC_VERSION}-${boot_triple}.tar.xz"
+      if "$(uname)" = "FreeBSD"; then
+          url="http://home.smart-cactus.org/~ben/ghc/ghc-9.4.1-x86_64-portbld-freebsd.tar.xz"
+      fi
       info "Fetching GHC binary distribution from $url..."
       curl "$url" > ghc.tar.xz || fail "failed to fetch GHC binary distribution"
       $TAR -xJf ghc.tar.xz || fail "failed to extract GHC binary distribution"


=====================================
.gitlab/gen_ci.hs
=====================================
@@ -306,7 +306,7 @@ opsysVariables _ FreeBSD13 = mconcat
     -- [1] https://www.freebsd.org/doc/en/books/porters-handbook/using-iconv.html)
     "CONFIGURE_ARGS" =:  "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib"
   , "HADRIAN_ARGS" =: "--docs=no-sphinx"
-  , "GHC_VERSION" =: "9.2.2"
+  , "GHC_VERSION" =: "9.4.1"
   , "CABAL_INSTALL_VERSION" =: "3.6.2.0"
   ]
 opsysVariables ARMv7 (Linux distro) =


=====================================
.gitlab/jobs.yaml
=====================================
@@ -586,7 +586,7 @@
       ".gitlab/ci.sh build_hadrian",
       ".gitlab/ci.sh test_hadrian"
     ],
-    "stage": "full-build",
+    "stage": "quick-build",
     "tags": [
       "x86_64-freebsd13"
     ],
@@ -594,9 +594,9 @@
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-x86_64-freebsd13-validate",
       "BUILD_FLAVOUR": "validate",
-      "CABAL": "/usr/local/bin/cabal",
+      "CABAL_INSTALL_VERSION": "3.6.2.0",
       "CONFIGURE_ARGS": "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib ",
-      "GHC_VERSION": "9.2.2",
+      "GHC_VERSION": "9.4.1",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "TEST_ENV": "x86_64-freebsd13-validate",
       "XZ_OPT": "-9"
@@ -2095,7 +2095,7 @@
       ".gitlab/ci.sh build_hadrian",
       ".gitlab/ci.sh test_hadrian"
     ],
-    "stage": "full-build",
+    "stage": "quick-build",
     "tags": [
       "x86_64-freebsd13"
     ],
@@ -2103,9 +2103,9 @@
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-x86_64-freebsd13-release",
       "BUILD_FLAVOUR": "release",
-      "CABAL": "/usr/local/bin/cabal",
+      "CABAL_INSTALL_VERSION": "3.6.2.0",
       "CONFIGURE_ARGS": "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib ",
-      "GHC_VERSION": "9.2.2",
+      "GHC_VERSION": "9.4.1",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "IGNORE_PERF_FAILURES": "all",
       "TEST_ENV": "x86_64-freebsd13-release",
@@ -3015,7 +3015,7 @@
       ".gitlab/ci.sh build_hadrian",
       ".gitlab/ci.sh test_hadrian"
     ],
-    "stage": "full-build",
+    "stage": "quick-build",
     "tags": [
       "x86_64-freebsd13"
     ],
@@ -3023,9 +3023,9 @@
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-x86_64-freebsd13-validate",
       "BUILD_FLAVOUR": "validate",
-      "CABAL": "/usr/local/bin/cabal",
+      "CABAL_INSTALL_VERSION": "3.6.2.0",
       "CONFIGURE_ARGS": "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib ",
-      "GHC_VERSION": "9.2.2",
+      "GHC_VERSION": "9.4.1",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "TEST_ENV": "x86_64-freebsd13-validate"
     }



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/640f6978e1cd13136bd6360e38f94e2d528b8b85...0135b58c04d5d3a891bf452007a08f94e6a144a2

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/640f6978e1cd13136bd6360e38f94e2d528b8b85...0135b58c04d5d3a891bf452007a08f94e6a144a2
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20220807/2f490229/attachment-0001.html>