Merge branch 'fixes'

.gitlab-ci.yml

@@ -255,7 +255,7 @@ test:windows:bootstrap_powershell_script:
 
 ######## linux test ########
 
-test:linux:recommended:
+test:linux:
   stage: test
   extends: .test_ghcup_version:linux
   variables:
@@ -263,14 +263,6 @@ test:linux:recommended:
     CABAL_VERSION: "3.4.0.0"
   needs: []
 
-test:linux:latest:
-  stage: test
-  extends: .test_ghcup_version:linux
-  variables:
-    GHC_VERSION: "9.0.1"
-    CABAL_VERSION: "3.4.0.0"
-  needs: []
-
 test:linux:cross-armv7:
   stage: test
   extends:
@@ -311,7 +303,7 @@ test:linux:git:hadrian:
 
 ######## linux 32bit test ########
 
-test:linux:recommended:32bit:
+test:linux:32bit:
   stage: test
   extends: .test_ghcup_version:linux32
   variables:
@@ -321,7 +313,7 @@ test:linux:recommended:32bit:
 
 ######## arm tests ########
 
-test:linux:recommended:armv7:
+test:linux:armv7:
   stage: test
   extends: .test_ghcup_version:armv7
   variables:
@@ -331,7 +323,7 @@ test:linux:recommended:armv7:
   when: manual
   needs: []
 
-test:linux:recommended:aarch64:
+test:linux:aarch64:
   stage: test
   extends: .test_ghcup_version:aarch64
   variables:
@@ -343,7 +335,7 @@ test:linux:recommended:aarch64:
 
 ######## darwin test ########
 
-test:mac:recommended:
+test:mac:
   stage: test
   extends: .test_ghcup_version:darwin
   variables:
@@ -351,15 +343,7 @@ test:mac:recommended:
     CABAL_VERSION: "3.4.0.0"
   needs: []
 
-test:mac:latest:
+test:mac:aarch64:
-  stage: test
-  extends: .test_ghcup_version:darwin
-  variables:
-    GHC_VERSION: "9.0.1"
-    CABAL_VERSION: "3.4.0.0"
-  needs: []
-
-test:mac:recommended:aarch64:
   stage: test
   extends: .test_ghcup_version:darwin:aarch64
   variables:
@@ -371,7 +355,7 @@ test:mac:recommended:aarch64:
 
 ######## freebsd test ########
 
-test:freebsd:recommended:
+test:freebsd:
   stage: test
   extends: .test_ghcup_version:freebsd
   variables:
@@ -383,7 +367,7 @@ test:freebsd:recommended:
 
 ######## windows test ########
 
-test:windows:recommended:
+test:windows:
   stage: test
   extends: .test_ghcup_version:windows
   variables:
@@ -400,7 +384,7 @@ test:windows:recommended:
 
 release:linux:64bit:
   stage: release
-  needs: ["test:linux:recommended", "test:linux:latest"]
+  needs: ["test:linux"]
   extends:
     - .alpine:64bit
     - .release_ghcup
@@ -414,7 +398,7 @@ release:linux:64bit:
 
 release:linux:32bit:
   stage: release
-  needs: ["test:linux:recommended:32bit"]
+  needs: ["test:linux:32bit"]
   extends:
     - .alpine:32bit
     - .release_ghcup
@@ -427,7 +411,7 @@ release:linux:32bit:
 
 release:linux:armv7:
   stage: release
-  needs: ["test:linux:recommended:armv7"]
+  needs: ["test:linux:armv7"]
   extends:
     - .linux:armv7
     - .release_ghcup
@@ -441,7 +425,7 @@ release:linux:armv7:
 
 release:linux:aarch64:
   stage: release
-  needs: ["test:linux:recommended:aarch64"]
+  needs: ["test:linux:aarch64"]
   extends:
     - .linux:aarch64
     - .release_ghcup
@@ -457,7 +441,7 @@ release:linux:aarch64:
 
 release:darwin:
   stage: release
-  needs: ["test:mac:recommended", "test:mac:latest"]
+  needs: ["test:mac"]
   extends:
     - .darwin
     - .release_ghcup
@@ -472,7 +456,7 @@ release:darwin:
 
 release:darwin:aarch64:
   stage: release
-  needs: ["test:mac:recommended:aarch64"]
+  needs: ["test:mac:aarch64"]
   extends:
     - .darwin:aarch64
     - .release_ghcup
@@ -509,7 +493,7 @@ release:darwin:aarch64:
 
 release:freebsd:
   stage: release
-  needs: ["test:freebsd:recommended"]
+  needs: ["test:freebsd"]
   extends:
     - .freebsd
     - .release_ghcup
@@ -526,7 +510,7 @@ release:freebsd:
 
 release:windows:
   stage: release
-  needs: ["test:windows:recommended"]
+  needs: ["test:windows"]
   extends:
     - .windows
     - .release_ghcup

bootstrap-haskell

@@ -275,6 +275,8 @@ find_shell() {
 ask_bashrc() {
 	if [ -n "${BOOTSTRAP_HASKELL_ADJUST_BASHRC}" ] ; then
 		return 1
+	elif [ -z "${MY_SHELL}" ] ; then
+		return 0
 	fi
 
 	while true; do

ghcup-0.0.6.yaml

@@ -19,6 +19,18 @@ toolRequirements:
           - libncurses5
           - libtinfo5
           notes: ''
+        ">= 11":
+          distroPKGs:
+          - build-essential
+          - curl
+          - libffi-dev
+          - libffi7
+          - libgmp-dev
+          - libgmp10
+          - libncurses-dev
+          - libncurses5
+          - libtinfo5
+          notes: ''
       Linux_Ubuntu:
         unknown_versioning:
           distroPKGs: