Allow our own cabal-install bindist builds

.cirrus.yml

@@ -1,33 +0,0 @@
-# release CI for FreeBSD
-compute_engine_instance:
-  image_project: freebsd-org-cloud-dev
-  image: family/freebsd-13-2
-  platform: freebsd
-  disk: 100 # Gb
-
-build_task:
-  timeout_in: 120m
-  trigger_type: manual
-  env:
-    ADD_CABAL_ARGS: "--enable-split-sections"
-    ARCH: 64
-    ARTIFACT: "x86_64-portbld-freebsd"
-    CIRRUS_CLONE_SUBMODULES: true
-    DISTRO: na
-    GHC_VERSION: 9.2.4
-    GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
-    RUNNER_OS: FreeBSD
-    TARBALL_EXT: tar.xz
-    TZ: Asia/Singapore
-  install_script:
-    - sed -i.bak -e 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
-    - pkg install -y ghc hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14 patchelf tree gmp libiconv
-  script:
-    - tzsetup Etc/GMT
-    - adjkerntz -a
-      #- git clone --branch cabal-install-v3.6.2.0-p1 https://github.com/hasufell/cabal.git
-      #- cd cabal/
-    - bash .github/scripts/build.sh
-  binaries_artifacts:
-    path: "cabal/out/*"
-

.github/workflows/cabal-release.yaml

@@ -24,7 +24,7 @@ jobs:
       ARCH: 64
       DEBIAN_FRONTEND: noninteractive
       TZ: Asia/Singapore
-      GHC_VERSION: 9.2.8
+      GHC_VERSION: 9.2.3
     strategy:
       fail-fast: false
       matrix:
@@ -129,7 +129,7 @@ jobs:
         run: |
           ${{ matrix.platform.installCmd }} curl bash git ${{ matrix.platform.toolRequirements }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: ${{ github.event.inputs.repo }}
           ref: ${{ github.event.inputs.ref }}
@@ -167,7 +167,7 @@ jobs:
       ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: ${{ github.event.inputs.repo }}
           ref: ${{ github.event.inputs.ref }}
@@ -198,7 +198,7 @@ jobs:
       TZ: Asia/Singapore
       ARCH: ARM64
       DISTRO: Ubuntu
-      GHC_VERSION: 9.2.8
+      GHC_VERSION: 9.2.2
     strategy:
       fail-fast: false
       matrix:
@@ -220,7 +220,7 @@ jobs:
           git config --global --get-all safe.directory | grep '^\*$' || git config --global --add safe.directory "*"
         shell: bash
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: ${{ github.event.inputs.repo }}
           ref: ${{ github.event.inputs.ref }}
@@ -261,9 +261,9 @@ jobs:
       ARCH: 64
       TARBALL_EXT: tar.xz
       DISTRO: na
-      GHC_VERSION: 9.2.8
+      GHC_VERSION: 9.2.3
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: ${{ github.event.inputs.repo }}
           ref: ${{ github.event.inputs.ref }}
@@ -294,9 +294,9 @@ jobs:
       TARBALL_EXT: tar.xz
       DISTRO: na
       HOMEBREW_CHANGE_ARCH_TO_ARM: 1
-      GHC_VERSION: 9.2.8
+      GHC_VERSION: 9.2.3
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: ${{ github.event.inputs.repo }}
           ref: ${{ github.event.inputs.ref }}
@@ -327,7 +327,7 @@ jobs:
       ARCH: 64
       TARBALL_EXT: "zip"
       DISTRO: na
-      GHC_VERSION: 9.2.8
+      GHC_VERSION: 9.2.3
     steps:
       - name: install windows deps
         shell: pwsh
@@ -337,7 +337,7 @@ jobs:
           C:\msys64\usr\bin\bash -lc "pacman --disable-download-timeout --noconfirm -S make mingw-w64-x86_64-clang curl autoconf mingw-w64-x86_64-pkgconf ca-certificates base-devel gettext autoconf make libtool automake python p7zip patch unzip zip git"
           taskkill /F /FI "MODULES eq msys-2.0.dll"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: ${{ github.event.inputs.repo }}
           ref: ${{ github.event.inputs.ref }}
@@ -366,7 +366,7 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: ${{ github.event.inputs.repo }}
           ref: ${{ github.event.inputs.ref }}

.github/workflows/install-bindist.sh

@@ -29,8 +29,6 @@ mkdir -p /tmp/install-bindist-ci
 cp "$METADATA_FILE" /tmp/install-bindist-ci/
 cd /tmp/install-bindist-ci
 
-trap 'rm -rf -- /tmp/install-bindist-ci' EXIT
-
 cat <<EOF > main.hs
 {- cabal:
 build-depends: base
@@ -105,10 +103,6 @@ case $TOOL in
 		ghc --info
 		ghc -prof main.hs
 		[[ $(./main +RTS -s) -eq 2 ]]
-		ghcup_fun install cabal recommended
-		cabal --version
-		cabal update
-		cabal install --lib --package-env=. clock
 		;;
     cabal)
 		ghcup_fun install ghc --set "$(ghcup_fun list -t ghc -r -c available | tail -1 | awk '{ print $2 }')"

ghcup-0.0.7.yaml

@@ -2954,12 +2954,6 @@ ghcupDownloads:
               dlUri: https://downloads.haskell.org/~ghc/9.2.8/ghc-9.2.8-aarch64-apple-darwin.tar.xz
               dlSubdir: ghc-9.2.8-aarch64-apple-darwin
               dlHash: 34db9b19571905b08ca1e444b46490e7c19cb73a0fe778696fa6ec02ff8d3c4b
-        A_ARM:
-          Linux_UnknownLinux:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/9.2.8/ghc-9.2.8-armv7-deb10-linux-gnueabihf.tar.xz
-              dlSubdir: ghc-9.2.8-armv7-linux-gnueabihf
-              dlHash: d8926744e542a89f150635fdb2d0234c715e39caface4dcb2f0f989c96af51f1
     9.4.1:
       viTags:
       - base-4.17.0.0

ghcup-0.0.8.yaml

@@ -2954,12 +2954,6 @@ ghcupDownloads:
               dlUri: https://downloads.haskell.org/~ghc/9.2.8/ghc-9.2.8-aarch64-apple-darwin.tar.xz
               dlSubdir: ghc-9.2.8-aarch64-apple-darwin
               dlHash: 34db9b19571905b08ca1e444b46490e7c19cb73a0fe778696fa6ec02ff8d3c4b
-        A_ARM:
-          Linux_UnknownLinux:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/9.2.8/ghc-9.2.8-armv7-deb10-linux-gnueabihf.tar.xz
-              dlSubdir: ghc-9.2.8-armv7-linux-gnueabihf
-              dlHash: d8926744e542a89f150635fdb2d0234c715e39caface4dcb2f0f989c96af51f1
     9.4.1:
       viTags:
       - base-4.17.0.0

ghcup-vanilla-0.0.7.yaml

@@ -2791,12 +2791,6 @@ ghcupDownloads:
               dlUri: https://downloads.haskell.org/~ghc/9.2.8/ghc-9.2.8-aarch64-apple-darwin.tar.xz
               dlSubdir: ghc-9.2.8-aarch64-apple-darwin
               dlHash: 34db9b19571905b08ca1e444b46490e7c19cb73a0fe778696fa6ec02ff8d3c4b
-        A_ARM:
-          Linux_UnknownLinux:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.8/ghc-9.2.8-armv7-deb10-linux.tar.xz
-              dlSubdir: ghc-9.2.8
-              dlHash: 78af6f7350fad956b1e4609a4c4a05e5522e9734c3038a9d56e3ceb5f260c7c4
     9.4.1:
       viTags:
       - base-4.17.0.0

ghcup-vanilla-0.0.8.yaml

@@ -2791,12 +2791,6 @@ ghcupDownloads:
               dlUri: https://downloads.haskell.org/~ghc/9.2.8/ghc-9.2.8-aarch64-apple-darwin.tar.xz
               dlSubdir: ghc-9.2.8-aarch64-apple-darwin
               dlHash: 34db9b19571905b08ca1e444b46490e7c19cb73a0fe778696fa6ec02ff8d3c4b
-        A_ARM:
-          Linux_UnknownLinux:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.8/ghc-9.2.8-armv7-deb10-linux.tar.xz
-              dlSubdir: ghc-9.2.8
-              dlHash: 78af6f7350fad956b1e4609a4c4a05e5522e9734c3038a9d56e3ceb5f260c7c4
     9.4.1:
       viTags:
       - base-4.17.0.0