Merge branch 'nightlies'

haskell · Jun 29, 2023 · 3e83a7f · 3e83a7f
2 parents 278a300 + 34ac9ce
commit 3e83a7f
Show file tree

Hide file tree

Showing 31 changed files with 14,327 additions and 10,340 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -1,5 +1,5 @@
 freebsd_instance:
- image_family: freebsd-13-1
+ image_family: freebsd-13-2
 
 build_task:
  name: build
@@ -16,7 +16,9 @@ build_task:
  AWS_ACCESS_KEY_ID: ENCRYPTED[6ed6287e2dd78ab5f84b22232c5245834ab042bd8ba443883aaf4b4d1ecc0481add1fdfad5ae6f6a8cfb418e6f19b2fc]
  AWS_SECRET_ACCESS_KEY: ENCRYPTED[16f3cda2954c7cee99444e6788eb5997382aa4ce1477e7523fef2586077541f43b5c816156961fc6b4677259679875a7]
  S3_HOST: ENCRYPTED[ce961780a33159f7d1d8046956b5ac6ebc3bfc8149428e5f538576cda51d9f3d0c35b79cdd1e325793639ff6e31f889d]
- install_script: pkg install -y ghc hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14
+ 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

diff --git a/.github/workflows/bootstrap.yaml b/.github/workflows/bootstrap.yaml
@@ -25,7 +25,7 @@ jobs:
  include:
  - os: ubuntu-latest
  DISTRO: Ubuntu
- - os: macOS-10.15
+ - os: macOS-11
  DISTRO: na
  - os: windows-latest
  DISTRO: na

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -81,7 +81,7 @@ jobs:
  name: Build ARM binary
  runs-on: ${{ matrix.os }}
  env:
- CABAL_VER: 3.8.1.0
+ CABAL_VER: 3.6.2.0
  JSON_VERSION: "0.0.7"
  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -90,7 +90,7 @@ jobs:
  fail-fast: true
  matrix:
  include:
- - os: [self-hosted, Linux, ARM64, aarch32-linux]
+ - os: [self-hosted, Linux, ARM64]
  ARTIFACT: "armv7-linux-ghcup"
  GHC_VER: 9.2.2
  ARCH: ARM
@@ -168,7 +168,7 @@ jobs:
  ARTIFACT: "aarch64-apple-darwin-ghcup"
  GHC_VER: 9.2.6
  ARCH: ARM64
- - os: macOS-10.15
+ - os: macOS-11
  ARTIFACT: "x86_64-apple-darwin-ghcup"
  GHC_VER: 9.2.6
  ARCH: 64
@@ -325,12 +325,12 @@ jobs:
  needs: "build-arm"
  runs-on: ${{ matrix.os }}
  env:
- CABAL_VER: 3.8.1.0
+ CABAL_VER: 3.6.2.0
  JSON_VERSION: "0.0.7"
  strategy:
  matrix:
  include:
- - os: [self-hosted, Linux, ARM64, aarch32-linux]
+ - os: [self-hosted, Linux, ARM64]
  ARTIFACT: "armv7-linux-ghcup"
  GHC_VER: 9.2.2
  ARCH: ARM
@@ -403,7 +403,7 @@ jobs:
  GHC_VER: 9.2.6
  ARCH: ARM64
  DISTRO: na
- - os: macOS-10.15
+ - os: macOS-11
  ARTIFACT: "x86_64-apple-darwin-ghcup"
  GHC_VER: 9.2.6
  ARCH: 64

diff --git a/app/ghcup/BrickMain.hs b/app/ghcup/BrickMain.hs
@@ -73,8 +73,8 @@ data BrickData = BrickData
  deriving Show
 
 data BrickSettings = BrickSettings
- { showAllVersions :: Bool
- , showAllTools :: Bool
+ { showAllVersions  :: Bool
+ , showAllTools  :: Bool
  }
  deriving Show
 
@@ -202,9 +202,11 @@ ui dimAttrs BrickState{ appSettings = as@BrickSettings{}, ..}
  printTag Recommended = Just $ withAttr (attrName "recommended") $ str "recommended"
  printTag Latest = Just $ withAttr (attrName "latest") $ str "latest"
  printTag Prerelease = Just $ withAttr (attrName "prerelease") $ str "prerelease"
+ printTag Nightly = Just $ withAttr (attrName "nightly") $ str "nightly"
  printTag (Base pvp'') = Just $ str ("base-" ++ T.unpack (prettyPVP pvp''))
  printTag Old = Nothing
  printTag LatestPrerelease = Just $ withAttr (attrName "latest-prerelease") $ str "latest-prerelease"
+ printTag LatestNightly = Just $ withAttr (attrName "latest-nightly") $ str "latest-nightly"
  printTag (UnknownTag t) = Just $ str t
 
  printTool Cabal = str "cabal"
@@ -218,6 +220,9 @@ ui dimAttrs BrickState{ appSettings = as@BrickSettings{}, ..}
  )
  ++ (if fromSrc then [withAttr (attrName "compiled") $ str "compiled"] else mempty)
  ++ (if lStray then [withAttr (attrName "stray") $ str "stray"] else mempty)
+ ++ (case lReleaseDay of
+ Nothing -> mempty
+ Just d -> [withAttr (attrName "day") $ str (show d)])
 
  -- | Draws the list elements.
  --
@@ -272,19 +277,22 @@ app attrs dimAttrs =
 defaultAttributes :: Bool -> AttrMap
 defaultAttributes no_color = attrMap
  Vty.defAttr
- [ (attrName "active" , Vty.defAttr `withBackColor` Vty.blue)
- , (attrName "not-installed", Vty.defAttr `withForeColor` Vty.red)
- , (attrName "set" , Vty.defAttr `withForeColor` Vty.green)
- , (attrName "installed" , Vty.defAttr `withForeColor` Vty.green)
- , (attrName "recommended" , Vty.defAttr `withForeColor` Vty.green)
- , (attrName "hls-powered" , Vty.defAttr `withForeColor` Vty.green)
- , (attrName "latest" , Vty.defAttr `withForeColor` Vty.yellow)
+ [ (attrName "active"  , Vty.defAttr `withBackColor` Vty.blue)
+ , (attrName "not-installed" , Vty.defAttr `withForeColor` Vty.red)
+ , (attrName "set"  , Vty.defAttr `withForeColor` Vty.green)
+ , (attrName "installed"  , Vty.defAttr `withForeColor` Vty.green)
+ , (attrName "recommended"  , Vty.defAttr `withForeColor` Vty.green)
+ , (attrName "hls-powered"  , Vty.defAttr `withForeColor` Vty.green)
+ , (attrName "latest"  , Vty.defAttr `withForeColor` Vty.yellow)
  , (attrName "latest-prerelease" , Vty.defAttr `withForeColor` Vty.red)
- , (attrName "prerelease" , Vty.defAttr `withForeColor` Vty.red)
- , (attrName "compiled" , Vty.defAttr `withForeColor` Vty.blue)
- , (attrName "stray" , Vty.defAttr `withForeColor` Vty.blue)
- , (attrName "help" , Vty.defAttr `withStyle` Vty.italic)
- , (attrName "hooray" , Vty.defAttr `withForeColor` Vty.brightWhite)
+ , (attrName "latest-nightly" , Vty.defAttr `withForeColor` Vty.red)
+ , (attrName "prerelease" , Vty.defAttr `withForeColor` Vty.red)
+ , (attrName "nightly" , Vty.defAttr `withForeColor` Vty.red)
+ , (attrName "compiled" , Vty.defAttr `withForeColor` Vty.blue)
+ , (attrName "stray" , Vty.defAttr `withForeColor` Vty.blue)
+ , (attrName "day" , Vty.defAttr `withForeColor` Vty.blue)
+ , (attrName "help" , Vty.defAttr `withStyle` Vty.italic)
+ , (attrName "hooray" , Vty.defAttr `withForeColor` Vty.brightWhite)
  ]
  where
  withForeColor | no_color = const
@@ -411,13 +419,17 @@ filterVisible :: Bool -> Bool -> ListResult -> Bool
 filterVisible v t e | lInstalled e = True
  | v
  , not t
+ , Nightly `notElem` lTag e
  , lTool e `notElem` hiddenTools = True
  | not v
  , t
- , Old `notElem` lTag e = True
+ , Old `notElem` lTag e
+ , Nightly `notElem` lTag e = True
  | v
+ , Nightly `notElem` lTag e
  , t = True
- | otherwise = (Old `notElem` lTag e) &&
+ | otherwise = (Old `notElem` lTag e) &&
+ (Nightly `notElem` lTag e) &&
  (lTool e `notElem` hiddenTools)
 
 
@@ -576,7 +588,7 @@ changelog' :: (MonadReader AppState m, MonadIO m)
  -> m (Either String ())
 changelog' _ (_, ListResult {..}) = do
  AppState { pfreq, ghcupInfo = GHCupInfo { _ghcupDownloads = dls }} <- ask
- case getChangeLog dls lTool (Left lVer) of
+ case getChangeLog dls lTool (ToolVersion lVer) of
  Nothing -> pure $ Left $
  "Could not find ChangeLog for " <> prettyShow lTool <> ", version " <> T.unpack (prettyVer lVer)
  Just uri -> do
@@ -656,5 +668,5 @@ getAppData mgi = runExceptT $ do
  settings <- liftIO $ readIORef settings'
 
  flip runReaderT settings $ do
- lV <- listVersions Nothing Nothing
+ lV <- listVersions Nothing [] False True (Nothing, Nothing)
  pure $ BrickData (reverse lV)
diff --git a/app/ghcup/GHCup/OptParse.hs b/app/ghcup/GHCup/OptParse.hs
@@ -244,7 +244,8 @@ com =
  <> command
  "list"
  (info (List <$> listOpts <**> helper)
- (progDesc "Show available GHCs and other tools")
+ (progDesc "Show available GHCs and other tools"
+ <> footerDoc (Just $ text listToolFooter))
  )
  <> command
  "upgrade"

diff --git a/app/ghcup/GHCup/OptParse/ChangeLog.hs b/app/ghcup/GHCup/OptParse/ChangeLog.hs
@@ -35,7 +35,6 @@ import qualified Data.Text as T
 import Control.Exception.Safe (MonadMask)
 import GHCup.Types.Optics
 import GHCup.Utils
-import Data.Versions
 import URI.ByteString (serializeURIRef')
 import Data.Char (toLower)
 
@@ -81,7 +80,7 @@ changelogP =
  <> completer toolCompleter
  )
  )
- <*> optional (toolVersionTagArgument Nothing Nothing)
+ <*> optional (toolVersionTagArgument [] Nothing)
 
 
 
@@ -115,20 +114,15 @@ changelog :: ( Monad m
 changelog ChangeLogOptions{..} runAppState runLogger = do
  GHCupInfo { _ghcupDownloads = dls } <- runAppState getGHCupInfo
  let tool = fromMaybe GHC clTool
- ver' = maybe
- (Right Latest)
- (\case
- GHCVersion tv -> Left (_tvVersion tv)
- ToolVersion tv -> Left tv
- ToolTag t -> Right t
- )
+ ver' = fromMaybe
+ (ToolTag Latest)
  clToolVer
  muri = getChangeLog dls tool ver'
  case muri of
  Nothing -> do
  runLogger
  (logWarn $
- "Could not find ChangeLog for " <> T.pack (prettyShow tool) <> ", version " <> either prettyVer (T.pack . show) ver'
+ "Could not find ChangeLog for " <> T.pack (prettyShow tool) <> ", version " <> T.pack (prettyShow ver')
  )
  pure ExitSuccess
  Just uri -> do