Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare release 2.10.0.0 #4448

Merged
merged 7 commits into from
Mar 30, 2025
Merged

Prepare release 2.10.0.0 #4448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29e558f
Update list of release GHC versions
fendor Mar 26, 2025
7bf1c3a
Bump version number to 2.10.0.0
fendor Mar 26, 2025
61049f8
Update GHC version support table
fendor Mar 26, 2025
4d54c82
Update ChangeLog
fendor Mar 26, 2025
a3df479
Fix typo in Bindist CI job trigger
fendor Mar 26, 2025
70c4661
Update the GHCup vanilla channel URL
fendor Mar 26, 2025
2318c61
Run linux bindist job on self-hosted runner
fendor Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions .github/generate-ci/gen_ci.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,18 @@ artifactName arch opsys = archName arch ++ "-" ++ case opsys of

data GHC
= GHC948
| GHC966
| GHC967
| GHC984
| GHC9101
| GHC9122
deriving (Eq, Enum, Bounded)

ghcVersion :: GHC -> String
ghcVersion GHC948 = "9.4.8"
ghcVersion GHC966 = "9.6.6"
ghcVersion GHC967 = "9.6.7"
ghcVersion GHC984 = "9.8.4"
ghcVersion GHC9101 = "9.10.1"
ghcVersion GHC9122 = "9.12.2"

ghcVersionIdent :: GHC -> String
ghcVersionIdent = filter (/= '.') . ghcVersion
Expand Down Expand Up @@ -186,6 +188,15 @@ runner AArch64 Darwin = ["self-hosted", "macOS", "ARM64"]
runner Amd64 Windows = ["windows-latest"]
runner AArch64 Windows = error "aarch64 windows not supported"

-- | Runner selection for bindist jobs
bindistRunner :: Arch -> Opsys -> [Value]
bindistRunner Amd64 (Linux _) = ["self-hosted", "linux-space", "maerwald"]
bindistRunner AArch64 (Linux _) = ["self-hosted", "Linux", "ARM64", "maerwald"]
bindistRunner Amd64 Darwin = ["macOS-13"]
bindistRunner AArch64 Darwin = ["self-hosted", "macOS", "ARM64"]
bindistRunner Amd64 Windows = ["windows-latest"]
bindistRunner AArch64 Windows = error "aarch64 windows not supported"

-------------------------------------------------------------------------------
-- Action generatation
-------------------------------------------------------------------------------
Expand Down Expand Up @@ -279,8 +290,8 @@ data Config = MkConfig Arch Opsys [GHC]
instance ToJSON CI where
toJSON (CI cs) = object
[ "name" .= str "Build and release"
, "on" .= object [ "push" .= [object ["tags" .= [str "*"]]]
, "schedule" .= [object ["cron" .= str "0 2 * * 1"]]
, "on" .= object [ "push" .= object ["tags" .= [str "*"]]
, "schedule" .= [object ["cron" .= str "0 2 * * 1"]]
]
, "env" .= object
[ "CABAL_CACHE_DISABLE" .= str "${{ vars.CABAL_CACHE_DISABLE }}"
Expand Down Expand Up @@ -415,7 +426,7 @@ buildJob arch os v =
mkBindistJob :: Arch -> Opsys -> [GHC] -> Job
mkBindistJob arch os vs =
K.fromString (bindistJobName arch os) .= object
[ "runs-on" .= runner arch os
[ "runs-on" .= bindistRunner arch os
, "name" .= (bindistJobName arch os ++ " (Prepare bindist)")
, "needs" .= [buildJobName arch os ver | ver <- vs]
, "env" .= thisEnv
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ install_ghcup() {
source "$(dirname "${GHCUP_BIN}")/env"
# make sure we use the vanilla channel for installing binaries
# see https://github.com/haskell/ghcup-metadata/pull/166#issuecomment-1893075575
ghcup config set url-source https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-vanilla-0.0.8.yaml
ghcup config set url-source https://raw.githubusercontent.com/haskell/ghcup-metadata/refs/heads/master/ghcup-vanilla-0.0.9.yaml
ghcup install cabal --set "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
fi
}
Expand Down
Loading
Loading