Skip to content

Bump version numbers to 3.10.3.0 #9728

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

Merged
merged 4 commits into from
Feb 21, 2024
Merged

Bump version numbers to 3.10.3.0 #9728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85b2959
Bump version numbers to 3.10.3.0
Kleidukos Feb 20, 2024
f8f6a53
Update bootstrap and CI for latest minor 9.4
Kleidukos Feb 20, 2024
3468d26
Regenerate the bootstrap files
Kleidukos Feb 20, 2024
d4d78d8
Disable windows runner for GHC 9.0.2
Kleidukos Feb 21, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/bootstrap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.5"]
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8"]
include:
- os: macos-latest
ghc: "9.2.8"
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ jobs:
strategy:
matrix:
os: ["ubuntu-20.04", "macos-latest", "windows-latest"]
ghc: ["9.4.5", "9.2.8", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
ghc: ["9.4.8", "9.2.8", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
exclude:
# Run takes 4+ hours
- os: "windows-latest"
ghc: "9.0.2"
# corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
- os: "windows-latest"
ghc: "8.10.7"
Expand Down
2 changes: 1 addition & 1 deletion Cabal-syntax/Cabal-syntax.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: Cabal-syntax
version: 3.10.2.0
version: 3.10.3.0
copyright: 2003-2023, Cabal Development Team (see AUTHORS file)
license: BSD-3-Clause
license-file: LICENSE
Expand Down
2 changes: 1 addition & 1 deletion Cabal/Cabal.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: Cabal
version: 3.10.2.1
version: 3.10.3.0
copyright: 2003-2023, Cabal Development Team (see AUTHORS file)
license: BSD-3-Clause
license-file: LICENSE
Expand Down
2 changes: 1 addition & 1 deletion Cabal/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=3.10.2.1
VERSION=3.10.3.0

#KIND=devel
KIND=rc
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,13 @@ tags :
##############################################################################

bootstrap-json-%: phony
cabal v2-build --project=cabal.project.release --with-compiler=ghc-$* --dry-run cabal-install:exe:cabal
cabal v2-build --project-file=cabal.project.release --with-compiler=ghc-$* --dry-run cabal-install:exe:cabal
cp dist-newstyle/cache/plan.json bootstrap/linux-$*.plan.json
@# -v0 to avoid build output on stdout
cd bootstrap && cabal v2-run -v0 cabal-bootstrap-gen -- linux-$*.plan.json \
| python3 -m json.tool > linux-$*.json

BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.8 9.4.5
BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.8 9.4.8

bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)

Expand Down
2 changes: 1 addition & 1 deletion bootstrap/cabal-bootstrap-gen.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ executable cabal-bootstrap-gen
, aeson ^>=1.5.2.0 || ^>=2.0.3.0 || ^>=2.1.0.0
, base ^>=4.12.0.0 || ^>=4.13.0.0 || ^>=4.14.0.0 || ^>=4.15.0.0 || ^>=4.16.0.0 || ^>=4.17.0.0
, bytestring ^>=0.10.8.2 || ^>=0.11.0.0
, Cabal ^>=3.2.0.0 || ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.8.1.0 || ^>=3.10.2.1
, Cabal ^>=3.8.1.0 || ^>=3.10.3
, Cabal-syntax ^>=3.8.1.0 || ^>=3.10.2.0
, cabal-install-parsers ^>=0.3.0.1 || ^>=0.4.5 || ^>=0.6
, cabal-plan ^>=0.7.0.0
Expand Down
Loading