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

Use Cabal-3.12 #155

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Use Cabal-3.12 #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 13 additions & 14 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.19.20240402
# version: 0.19.20240608
#
# REGENDATA ("0.19.20240402",["github","--config=cabal.haskell-ci","cabal.project"])
# REGENDATA ("0.19.20240608",["github","--config=cabal.haskell-ci","cabal.project"])
#
name: Haskell-CI
on:
Expand All @@ -27,7 +27,7 @@ jobs:
timeout-minutes:
60
container:
image: buildpack-deps:bionic
image: buildpack-deps:jammy
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
Expand All @@ -46,9 +46,8 @@ jobs:
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
Expand All @@ -66,7 +65,7 @@ jobs:
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
Expand Down Expand Up @@ -125,14 +124,14 @@ jobs:
- name: install cabal-docspec
run: |
mkdir -p $HOME/.cabal/bin
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20231219/cabal-docspec-0.0.0.20231219-x86_64-linux.xz > cabal-docspec.xz
echo '8b60448275466bbe2b9409741b5dd07a41c541283017b95b44efe6e31379d067 cabal-docspec.xz' | sha256sum -c -
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz > cabal-docspec.xz
echo '2d18a3f79619e8ec5f11870f926f6dc2616e02a6c889315b7f82044b95a1adb9 cabal-docspec.xz' | sha256sum -c -
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
rm -f cabal-docspec.xz
chmod a+x $HOME/.cabal/bin/cabal-docspec
cabal-docspec --version
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: source
- name: initial cabal.project for sdist
Expand Down Expand Up @@ -238,10 +237,10 @@ jobs:
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
packages:
$GITHUB_WORKSPACE/source/extras/gentle-introduction-2024.4.tar.gz
$GITHUB_WORKSPACE/source/extras/gentle-introduction-2024.4.1.tar.gz

packages: $GITHUB_WORKSPACE/source/extras/hooglite-0.20240409.tar.gz
constraints: Cabal ^>=3.10.3.0
constraints: Cabal ^>=3.12.1.0
constraints: optics-core ^>=0.4.1
constraints: aeson ^>=2.2.1.0
constraints: directory installed
Expand All @@ -254,15 +253,15 @@ jobs:
allow-newer: serialise-0.2.6.0:strict
allow-newer: serialise-0.2.6.0:these
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|Cabal-syntax|cabal-bundler|cabal-core-inspection|cabal-deps|cabal-diff|cabal-docspec|cabal-env|cabal-haddock-server|cabal-hasklint|cabal-hie|cabal-iface-query|cabal-store-check|cabal-store-gc|paths|peura)$/; }' >> cabal.project.local
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(Cabal|Cabal-syntax|cabal-bundler|cabal-core-inspection|cabal-deps|cabal-diff|cabal-docspec|cabal-env|cabal-haddock-server|cabal-hasklint|cabal-hie|cabal-iface-query|cabal-store-check|cabal-store-gc|paths|peura)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
- name: dump install plan
run: |
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
cabal-plan
- name: restore cache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
Expand Down Expand Up @@ -322,7 +321,7 @@ jobs:
rm -f cabal.project.local
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: save cache
uses: actions/cache/save@v3
uses: actions/cache/save@v4
if: always()
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
Expand Down
4 changes: 2 additions & 2 deletions cabal-bundler/cabal-bundler.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ library cabal-bundler-internal
, template-haskell
, text ^>=2.1

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
4 changes: 2 additions & 2 deletions cabal-core-inspection/cabal-core-inspection.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ library cabal-core-inspection-internal
, ghc
, ghc-boot

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
4 changes: 2 additions & 2 deletions cabal-deps/cabal-deps.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ library cabal-deps-internal
, template-haskell
, text ^>=2.1

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
4 changes: 2 additions & 2 deletions cabal-diff/cabal-diff.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ library cabal-diff-internal
, template-haskell
, text ^>=2.1

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
1 change: 1 addition & 0 deletions cabal-docspec/Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# 0.0.0.20240702

- Support `cabal-install-3.12` changed store directory logic
- Update dependencies, in particular use `Cabal-3.12.1.0`

# 0.0.0.20240414

Expand Down
4 changes: 2 additions & 2 deletions cabal-docspec/cabal-docspec.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ library cabal-docspec-internal
, template-haskell
, text ^>=2.1

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
4 changes: 2 additions & 2 deletions cabal-env/cabal-env.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ library cabal-env-internal
, template-haskell
, text ^>=2.1

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
4 changes: 2 additions & 2 deletions cabal-haddock-server/cabal-haddock-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ library cabal-haddock-server-internal
, template-haskell
, text ^>=2.1

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
4 changes: 2 additions & 2 deletions cabal-hasklint/cabal-hasklint.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ library cabal-hasklint-internal
, template-haskell
, text ^>=2.1

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
4 changes: 2 additions & 2 deletions cabal-hie/cabal-hie.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ library cabal-hie-internal
, template-haskell
, text ^>=2.1

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
4 changes: 2 additions & 2 deletions cabal-iface-query/cabal-iface-query.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ library cabal-iface-query-internal
, ghc
, ghc-boot

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
4 changes: 2 additions & 2 deletions cabal-store-check/cabal-store-check.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ library cabal-store-check-internal
, template-haskell
, text ^>=2.1

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
4 changes: 2 additions & 2 deletions cabal-store-gc/cabal-store-gc.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ library cabal-store-gc-internal
, template-haskell
, text ^>=2.1

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- We also use peura
build-depends: peura
Expand Down
2 changes: 0 additions & 2 deletions cabal.haskell-ci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
distribution: bionic
branches: master
installed: +all -Cabal -Cabal-syntax
docspec: True
docspec-options: --verbose
jobs-selection: uniform
cabal-install-version: 3.6
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ package *
package peura
flags: -concurrent-output

constraints: Cabal ^>=3.10.3.0
constraints: Cabal ^>=3.12.1.0

-- some constraints to force latest versions
constraints: optics-core ^>=0.4.1
Expand Down
Binary file added extras/gentle-introduction-2024.4.1.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file removed extras/gentle-introduction-2024.4.tar.gz
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions peura/peura.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ library
, template-haskell
, text ^>=2.1

-- We use Cabal-3.10
build-depends: Cabal ^>=3.10.3.0
-- We use Cabal-3.12
build-depends: Cabal ^>=3.12.1.0

-- Common exports
build-depends: gentle-introduction ^>=2024.4
Expand Down