Bump 'versions' package min bound

2024-01-24 15:27:10 +08:00
17 changed files with 75 additions and 146 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -0,0 +1,28 @@
+freebsd_instance:
+  image_family: freebsd-13-2
+
+build_task:
+  name: build
+  env:
+    GHC_VER: 9.4.8
+    CABAL_VER: 3.10.2.0
+    ARTIFACT: "x86_64-portbld-freebsd-ghcup"
+    ARCH: 64
+    RUNNER_OS: FreeBSD
+    DISTRO: na
+    GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
+    JSON_VERSION: "0.0.7"
+    CIRRUS_CLONE_SUBMODULES: true
+    AWS_ACCESS_KEY_ID: ENCRYPTED[6ed6287e2dd78ab5f84b22232c5245834ab042bd8ba443883aaf4b4d1ecc0481add1fdfad5ae6f6a8cfb418e6f19b2fc]
+    AWS_SECRET_ACCESS_KEY: ENCRYPTED[16f3cda2954c7cee99444e6788eb5997382aa4ce1477e7523fef2586077541f43b5c816156961fc6b4677259679875a7]
+    S3_HOST: ENCRYPTED[ce961780a33159f7d1d8046956b5ac6ebc3bfc8149428e5f538576cda51d9f3d0c35b79cdd1e325793639ff6e31f889d]
+  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
+  script:
+    - tzsetup Etc/GMT
+    - adjkerntz -a
+    - bash .github/scripts/build.sh
+    - bash .github/scripts/test.sh
+  binaries_artifacts:
+    path: "out/*"
--- a/.github/scripts/env.sh
+++ b/.github/scripts/env.sh
@@ -9,10 +9,6 @@ fi
 export DEBIAN_FRONTEND=noninteractive
 export TZ=Asia/Singapore

-if [ "${RUNNER_OS}" = "freebsd" ] ; then
-    export RUNNER_OS=FreeBSD
-fi
-
 export OS="$RUNNER_OS"
 export PATH="$HOME/.local/bin:$PATH"

--- a/.github/workflows/cross.yaml
+++ b/.github/workflows/cross.yaml
@@ -19,7 +19,7 @@ env:
 jobs:
  build:
    name: Build linux binary
-    runs-on: [self-hosted, Linux, X64, maerwald]
+    runs-on: ubuntu-latest
    env:
      CABAL_VER: 3.10.1.0
      JSON_VERSION: "0.0.7"
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -57,7 +57,6 @@ jobs:
    steps:
      - uses: docker://arm64v8/ubuntu:focal
        name: Cleanup (aarch64 linux)
-        continue-on-error: true
        with:
          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"

@@ -94,7 +93,6 @@ jobs:
    steps:
      - uses: docker://arm64v8/ubuntu:focal
        name: Cleanup (aarch64 linux)
-        continue-on-error: true
        with:
          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"

--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -94,15 +94,20 @@ jobs:
      fail-fast: true
      matrix:
        include:
-          - os: [self-hosted, Linux, ARM64, maerwald]
+          - os: [self-hosted, Linux, ARM64]
            ARTIFACT: "armv7-linux-ghcup"
            GHC_VER: 9.2.8
            ARCH: ARM
-          - os: [self-hosted, Linux, ARM64, maerwald]
+          - os: [self-hosted, Linux, ARM64]
            ARTIFACT: "aarch64-linux-ghcup"
            GHC_VER: 9.4.8
            ARCH: ARM64
    steps:
+      - uses: docker://arm64v8/debian:10
+        name: Cleanup (aarch64 linux)
+        with:
+          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
+
      - name: git config
        run: |
          git config --global --get-all safe.directory | grep '^\*$' || git config --global --add safe.directory "*"
@@ -241,42 +246,6 @@ jobs:
          path: |
            ./out/*

-  build-freebsd:
-    name: Build binary (FreeBSD)
-    runs-on: [self-hosted, FreeBSD, X64]
-    env:
-      CABAL_VER: 3.10.2.0
-      MACOSX_DEPLOYMENT_TARGET: 10.13
-      JSON_VERSION: "0.0.8"
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      S3_HOST: ${{ secrets.S3_HOST }}
-      ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-      GHC_VER: 9.4.8
-      ARCH: 64
-      DISTRO: na
-      RUNNER_OS: FreeBSD
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-
-      - name: Run build
-        run: |
-          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 libiconv
-          tzsetup Etc/GMT
-          adjkerntz -a
-          bash .github/scripts/build.sh
-      - if: always()
-        name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: artifacts
-          path: |
-            ./out/*
-
  test-linux:
    name: Test linux
    needs: "build-linux"
@@ -365,18 +334,23 @@ jobs:
    strategy:
      matrix:
        include:
-          - os: [self-hosted, Linux, ARM64, maerwald]
+          - os: [self-hosted, Linux, ARM64]
            ARTIFACT: "armv7-linux-ghcup"
            GHC_VER: 9.2.8
            ARCH: ARM
            DISTRO: Ubuntu
-          - os: [self-hosted, Linux, ARM64, maerwald]
+          - os: [self-hosted, Linux, ARM64]
            ARTIFACT: "aarch64-linux-ghcup"
            GHC_VER: 9.4.8
            ARCH: ARM64
            DISTRO: Ubuntu

    steps:
+      - uses: docker://arm64v8/debian:10
+        name: Cleanup (aarch64 linux)
+        with:
+          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
+
      - name: Checkout code
        uses: actions/checkout@v3
        with:
@@ -493,41 +467,6 @@ jobs:
          name: testfiles
          path: |
            ./test/ghcup-test/golden/unix/GHCupInfo*json
-  test-freebsd:
-    name: Test FreeBSD
-    needs: "build-freebsd"
-    runs-on: [self-hosted, FreeBSD, X64]
-    env:
-      CABAL_VER: 3.10.2.0
-      MACOSX_DEPLOYMENT_TARGET: 10.13
-      JSON_VERSION: "0.0.8"
-      ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-      GHC_VER: 9.4.8
-      ARCH: 64
-      DISTRO: na
-      RUNNER_OS: FreeBSD
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifacts
-          path: ./out
-
-      - name: Run test
-        run: |
-          bash .github/scripts/test.sh
-
-      - if: failure()
-        name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: testfiles
-          path: |
-            ./test/ghcup-test/golden/unix/GHCupInfo*json
  hls:
    name: hls
    needs: build-linux
@@ -561,7 +500,7 @@ jobs:

  release:
    name: release
-    needs: ["test-linux", "test-arm", "test-macwin", "test-freebsd", "hls"]
+    needs: ["test-linux", "test-arm", "test-macwin", "hls"]
    runs-on: ubuntu-latest
    if: startsWith(github.ref, 'refs/tags/v')
    steps:
--- a/app/ghcup/BrickMain.hs
+++ b/app/ghcup/BrickMain.hs
@@ -11,7 +11,6 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE ViewPatterns          #-}

 module BrickMain where

@@ -203,35 +202,34 @@ handleGenericListEvent (VtyEvent ev) = do
 handleGenericListEvent _ = pure ()

 -- This re-uses Brick.Widget.List.renderList
-renderSectionList :: forall n t e . (Traversable t, Ord n, Show n, Eq n, L.Splittable t, Semigroup (t e))
+renderSectionList :: (Traversable t, Ord n, Show n, Eq n, L.Splittable t)
                  => (Bool -> e -> Widget n)             -- ^ Rendering function of the list element, True for the selected element
                  -> Bool                                -- ^ Whether the section list has focus
                  -> GenericSectionList n t e            -- ^ The section list to render
                  -> Widget n
-renderSectionList renderElem sectionFocus ge@(GenericSectionList focus elms slName) =
-    Brick.Widget Brick.Greedy Brick.Greedy $ Brick.render $ Brick.viewport slName Brick.Vertical $
-      V.ifoldl' (\(!accWidget) !i list ->
-                      let hasFocusList = sectionIsFocused list
-                          makeVisible = if hasFocusList then Brick.visibleRegion (Brick.Location (c, r)) (1, 1) else id
-                          appendBorder = if i == 0 then id else (hBorder <=>)
-                          newWidget = appendBorder (makeVisible $ renderInnerList hasFocusList list)
-                      in accWidget <=> newWidget
-                      )
-      Brick.emptyWidget
-      elms
- where
-  -- A section is focused if the whole thing is focused, and the inner list has focus
-  sectionIsFocused :: L.GenericList n t e -> Bool
-  sectionIsFocused l = sectionFocus && (Just (L.listName l) == F.focusGetCurrent focus)
-
-  renderInnerList :: Bool -> L.GenericList n t e -> Widget n
-  renderInnerList hasFocus l = Brick.vLimit (length l) $ L.renderList (\b -> renderElem (b && hasFocus)) hasFocus l
-
-  -- compute the location to focus on within the active section
-  (c, r) :: (Int, Int) = case sectionListSelectedElement ge of
-                           Nothing -> (0, 0)
-                           Just (selElIx, _) -> (0, selElIx)
-
+renderSectionList render_elem section_focus (GenericSectionList focus elms sl_name) =
+    Brick.Widget Brick.Greedy Brick.Greedy $ do
+        c <- Brick.getContext
+        let -- A section is focused if the whole thing is focused, and the inner list has focus
+            section_is_focused l = section_focus && (Just (L.listName l) == F.focusGetCurrent focus)
+            -- We need to limit the widget size when the length of the list is higher than the size of the terminal
+            limit = min (Brick.windowHeight c) (Brick.availHeight c)
+            s_idx = fromMaybe 0 $ V.findIndex section_is_focused elms
+            render_inner_list has_focus l = Brick.vLimit (length l) $ L.renderList (\b -> render_elem (b && has_focus)) has_focus l
+            (widget, off) = 
+                V.ifoldl' (\wacc i list ->
+                                let has_focus_list = section_is_focused list
+                                    (!acc_widget, !acc_off) = wacc
+                                    new_widget = if i == 0 then render_inner_list has_focus_list list else hBorder <=> render_inner_list has_focus_list list
+                                    new_off 
+                                        | i < s_idx  = 1 + L.listItemHeight list * length list 
+                                        | i == s_idx = 1 + L.listItemHeight list * fromMaybe 0 (L.listSelected list)
+                                        | otherwise  = 0
+                                in  (acc_widget <=> new_widget, acc_off + new_off)
+                                )
+                (Brick.emptyWidget, 0)
+                elms
+        Brick.render $  Brick.viewport sl_name Brick.Vertical $ Brick.translateBy (Brick.Location (0, min 0 (limit-off))) widget

 -- | Equivalent to listSelectedElement
 sectionListSelectedElement :: (Eq n, L.Splittable t, Traversable t, Semigroup (t e)) => GenericSectionList n t e -> Maybe (Int, e)
--- a/cabal.ghc8107.project
+++ b/cabal.ghc8107.project
@@ -26,11 +26,6 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
 package libarchive
  flags: -system-libarchive

--- a/cabal.ghc8107.project.freeze
+++ b/cabal.ghc8107.project.freeze
@@ -239,7 +239,7 @@ constraints: any.Cabal ==3.6.3.0,
             vector +boundschecks -internalchecks -unsafechecks -wall,
             any.vector-binary-instances ==0.2.5.2,
             any.vector-stream ==0.1.0.1,
-             any.versions ==6.0.4,
+             any.versions ==6.0.5,
             any.vty ==6.0,
             any.vty-crossplatform ==0.2.0.0,
             vty-crossplatform -demos,
--- a/cabal.ghc902.project
+++ b/cabal.ghc902.project
@@ -26,11 +26,6 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
 package libarchive
  flags: -system-libarchive

--- a/cabal.ghc902.project.freeze
+++ b/cabal.ghc902.project.freeze
@@ -248,7 +248,7 @@ constraints: any.Cabal ==3.6.3.0,
             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
             any.vector-binary-instances ==0.2.5.2,
             any.vector-stream ==0.1.0.1,
-             any.versions ==6.0.4,
+             any.versions ==6.0.5,
             any.vty ==6.0,
             any.vty-crossplatform ==0.2.0.0,
             vty-crossplatform -demos,
--- a/cabal.ghc928.project
+++ b/cabal.ghc928.project
@@ -26,11 +26,6 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
 package libarchive
  flags: -system-libarchive

--- a/cabal.ghc928.project.freeze
+++ b/cabal.ghc928.project.freeze
@@ -248,7 +248,7 @@ constraints: any.Cabal ==3.6.3.0,
             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
             any.vector-binary-instances ==0.2.5.2,
             any.vector-stream ==0.1.0.1,
-             any.versions ==6.0.4,
+             any.versions ==6.0.5,
             any.vty ==6.0,
             any.vty-crossplatform ==0.2.0.0,
             vty-crossplatform -demos,
--- a/cabal.ghc948.project
+++ b/cabal.ghc948.project
@@ -26,11 +26,6 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
 package libarchive
  flags: -system-libarchive

--- a/cabal.ghc948.project.freeze
+++ b/cabal.ghc948.project.freeze
@@ -246,7 +246,7 @@ constraints: any.Cabal ==3.6.3.0 || ==3.8.1.0,
             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
             any.vector-binary-instances ==0.2.5.2,
             any.vector-stream ==0.1.0.1,
-             any.versions ==6.0.4,
+             any.versions ==6.0.5,
             any.vty ==6.0,
             any.vty-crossplatform ==0.2.0.0,
             vty-crossplatform -demos,
--- a/cabal.project
+++ b/cabal.project
@@ -26,11 +26,6 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
 package libarchive
  flags: -system-libarchive

--- a/cabal.project.release
+++ b/cabal.project.release
@@ -56,10 +56,5 @@ source-repository-package
  location: https://github.com/hasufell/uri-bytestring.git
  tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

-source-repository-package
-  type: git
-  location: https://github.com/hasufell/versions.git
-  tag: 79e18fbc44fae3064d8957c550cc0229465db320
-
 allow-newer: cabal-install-parsers:tar

--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -96,7 +96,7 @@ common app-common-depends
    , uri-bytestring         ^>=0.3.2.2
    , utf8-string            ^>=1.0
    , vector                 >=0.12     && <0.14
-    , versions               >=6.0.3    && <6.1
+    , versions               >=6.0.5    && <6.1
    , yaml-streamly          ^>=0.12.0

  if flag(tar)
@@ -212,7 +212,7 @@ library
    , unordered-containers  ^>=0.2.10.0
    , uri-bytestring        ^>=0.3.2.2
    , vector                 >=0.12     && <0.14
-    , versions              >=6.0.3      && <6.1
+    , versions               >=6.0.5    && <6.1
    , word8                 ^>=0.1.3
    , yaml-streamly         ^>=0.12.0
    , zlib                  ^>=0.6.2.2
@@ -408,7 +408,7 @@ test-suite ghcup-test
    , text                      ^>=2.0
    , time                      >=1.9.3   && <1.12
    , uri-bytestring            ^>=0.3.2.2
-    , versions                  >=6.0.3   && <6.1
+    , versions               >=6.0.5    && <6.1

  if os(windows)
    cpp-options: -DIS_WINDOWS