Skip to content

Commit d8f153e

Browse files
Prepare for release version 0.7.1
1 parent 7c4e1ab commit d8f153e

File tree

9 files changed

+50
-34
lines changed

9 files changed

+50
-34
lines changed

.circleci/config.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# packcheck-0.7.0
1+
# packcheck-0.7.1
22
# You can use any of the options supported by packcheck as environment
33
# variables here. See https://github.com/composewell/packcheck for all
44
# options and their explanation.
@@ -16,7 +16,7 @@ env: &env
1616
# ------------------------------------------------------------------------
1717
# GHC_OPTIONS: "-Werror"
1818
# For updating see: https://downloads.haskell.org/~ghcup/
19-
GHCUP_VERSION: 0.1.20.0
19+
GHCUP_VERSION: 0.1.40.0
2020
CABAL_REINIT_CONFIG: "y"
2121
LC_ALL: "C.UTF-8"
2222

@@ -38,7 +38,7 @@ env: &env
3838
# version.
3939
#STACKVER: "1.6.5"
4040
#STACK_UPGRADE: "y"
41-
#RESOLVER: "lts-21"
41+
#RESOLVER: "lts-23"
4242
STACK_YAML: "stack.yaml"
4343

4444
# ------------------------------------------------------------------------
@@ -65,7 +65,7 @@ env: &env
6565
# If you have not committed packcheck.sh in your repo at PACKCHECK
6666
# then it is automatically pulled from this URL.
6767
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
68-
PACKCHECK_GITHUB_COMMIT: "v0.7.0"
68+
PACKCHECK_GITHUB_COMMIT: "v0.7.1"
6969

7070
# ubuntu seems to have better support than debian on CI systems
7171
docker:
@@ -147,23 +147,23 @@ save: &save
147147
#-----------------------------------------------------------------------------
148148

149149
jobs:
150-
cabal-ghc-9-8-1:
150+
cabal-ghc-9-8-4:
151151
<<: *env
152152
steps:
153153
- checkout
154154
- *restore
155155
- *preinstall
156156
- run: |
157-
bash -c "$PACKCHECK cabal GHCVER=9.8.1"
157+
bash -c "$PACKCHECK cabal GHCVER=9.8.4"
158158
- *save
159-
cabal-ghc-9-6-3:
159+
cabal-ghc-9-6-6:
160160
<<: *env
161161
steps:
162162
- checkout
163163
- *restore
164164
- *preinstall
165165
- run: |
166-
bash -c "$PACKCHECK cabal GHCVER=9.6.3"
166+
bash -c "$PACKCHECK cabal GHCVER=9.6.6"
167167
- *save
168168
cabal-ghc-9-4-8:
169169
<<: *env
@@ -201,25 +201,25 @@ jobs:
201201
- run: |
202202
bash -c "$PACKCHECK cabal-v2 GHCVER=8.10.7"
203203
- *save
204-
stack-lts-21:
204+
stack-lts-23:
205205
<<: *env
206206
steps:
207207
- checkout
208208
- *restore
209209
- *preinstall
210210
- run: |
211-
bash -c "$PACKCHECK stack RESOLVER=lts-21"
211+
bash -c "$PACKCHECK stack RESOLVER=lts-23"
212212
- *save
213213

214214
workflows:
215215
version: 2
216216
build:
217217
jobs:
218218
# Uncomment the configs that you want to enable
219-
- cabal-ghc-9-8-1
220-
- cabal-ghc-9-6-3
219+
- cabal-ghc-9-8-4
220+
- cabal-ghc-9-6-6
221221
- cabal-ghc-9-4-8
222222
- cabal-ghc-9-2-8
223223
- cabal-ghc-9-0-1
224224
- cabal-ghc-8-10-7
225-
- stack-lts-21
225+
- stack-lts-23

.cirrus.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ freebsd_instance:
22
image_family: freebsd-14-0
33

44
task:
5-
name: FreeBSD+packcheck+ghc-9.6.3+cabal-v2
5+
name: FreeBSD+packcheck+ghc-9.10.1+cabal-v2
66
env:
77
LC_ALL: C.UTF-8
88
BUILD: cabal-v2
9-
GHCUP_VERSION: 0.1.20.0
10-
DOCSPEC_URL: https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20210111/cabal-docspec-0.0.0.20210111.xz
9+
GHCUP_VERSION: 0.1.40.0
10+
DOCSPEC_URL: https://github.com/phadej/cabal-extras/releases/tag/cabal-docspec-0.0.0.20240703
1111
DOCSPEC_OPTIONS: "--timeout 60 --check-properties --property-variables xs"
1212
# GHCUP_GHC_OPTIONS: ${{ matrix.ghcup_ghc_options }}
13-
GHCVER: 9.6.3
14-
CABALVER: 3.10.1.0
13+
GHCVER: 9.10.1
14+
CABALVER: 3.12.1.0
1515
DISABLE_DOCS: n
1616
ENABLE_DOCSPEC: n
1717
DISABLE_TEST: n
@@ -36,7 +36,7 @@ task:
3636
# packcheck location and revision
3737
PACKCHECK: "./packcheck.sh"
3838
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
39-
PACKCHECK_GITHUB_COMMIT: "084ed12f33ba9ef719aabefa7662a0fa600165dd"
39+
PACKCHECK_GITHUB_COMMIT: "v0.7.1"
4040

4141
# Pull token from "secrets" setting of the github repo
4242
# COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

.github/workflows/packcheck.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# packcheck-0.7.0
1+
# packcheck-0.7.1
22
# You can use any of the options supported by packcheck as environment
33
# variables here. See https://github.com/composewell/packcheck for all
44
# options and their explanation.
@@ -49,7 +49,7 @@ jobs:
4949
# Selecting tool versions
5050
# ------------------------------------------------------------------------
5151
# For updating see: https://downloads.haskell.org/~ghcup/
52-
GHCUP_VERSION: 0.1.20.0
52+
GHCUP_VERSION: 0.1.40.0
5353
GHCVER: ${{ matrix.ghc_version }}
5454
GHCUP_GHC_OPTIONS: ${{ matrix.ghcup_ghc_options }}
5555
# RESOLVER: ${{ matrix.stack_resolver }}
@@ -88,7 +88,7 @@ jobs:
8888
# If you have not committed packcheck.sh in your repo at PACKCHECK
8989
# then it is automatically pulled from this URL.
9090
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
91-
PACKCHECK_GITHUB_COMMIT: "v0.7.0"
91+
PACKCHECK_GITHUB_COMMIT: "v0.7.1"
9292

9393
# ------------------------------------------------------------------------
9494
# Final build variables
@@ -122,7 +122,7 @@ jobs:
122122
- name: ci
123123
command: cabal
124124
runner: ubuntu-latest
125-
ghc_version: 9.8.1
125+
ghc_version: 9.8.4
126126
cabal_project: cabal.project
127127

128128
- name: ci
@@ -131,7 +131,19 @@ jobs:
131131
cabal_project: cabal.project
132132

133133
- name: ci
134-
ghc_version: 9.8.1
134+
ghc_version: 9.8.4
135+
command: cabal
136+
runner: macos-latest
137+
cabal_project: cabal.project
138+
139+
- name: ci
140+
ghc_version: 9.10.1
141+
command: cabal
142+
runner: macos-latest
143+
cabal_project: cabal.project
144+
145+
- name: ci
146+
ghc_version: 9.12.1
135147
command: cabal
136148
runner: macos-latest
137149
cabal_project: cabal.project

Changelog.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
## Unreleased
1+
## 0.7.1 (Feb 2025)
22

33
* Set default "ghc" in PATH for cabal-docspec to work
4+
* FreeBSD support and Cirrus CI support for FreeBSD - see `.cirrus.yml`
5+
* `CABAL_TEST_OPTIONS` envvar to pass test-only options to cabal
46

57
## 0.7.0 (Dec 2023)
68

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,14 +294,14 @@ help | --help | -h : show this help message
294294
--------------------------------------------------
295295
Selecting tool versions
296296
--------------------------------------------------
297-
GHCUP_VERSION : [a.b.c.d] GHCUP version to install GHCVER if needed
297+
GHCUP_VERSION : [a.b.c.d] ghcup version to install at $HOME/.ghcup/bin/ghcup (see https://downloads.haskell.org/~ghcup)
298298
GHCVER : [a.b.c | head] GHC version prefix (may not be enforced when using stack)
299299
CABALVER : [a.b.c.d] Cabal version (prefix) to use
300300
STACKVER : [a.b.c.d] Stack version (prefix) to use
301301
STACK_UPGRADE : [y] DESTRUCTIVE! Upgrades stack to latest version
302302
RESOLVER : Stack resolver to use for stack builds or cabal builds using stack
303-
HLINT_VERSION : Download a specific version binary of hlint instead of using one in PATH
304-
DOCSPEC_URL : cabal-docspec release URL to install at ~/.local/bin/cabal-docspec (see https://github.com/phadej/cabal-extras/releases/)
303+
HLINT_VERSION : hlint version to install at $HOME/.local/bin/hlint (see https://github.com/ndmitchell/hlint/releases)
304+
DOCSPEC_URL : cabal-docspec release URL to install at $HOME/.local/bin/cabal-docspec (see https://github.com/phadej/cabal-extras/releases/)
305305
306306
--------------------------------------------------
307307
Where to find the required tools

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# packcheck-0.7.0
1+
# packcheck-0.7.1
22
# You can use any of the options supported by packcheck as environment
33
# variables here. See https://github.com/composewell/packcheck for all
44
# options and their explanation.
@@ -63,7 +63,7 @@ environment:
6363
# If you have not committed packcheck.sh in your repo at PACKCHECK_LOCAL_PATH
6464
# then it is automatically pulled from this URL.
6565
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
66-
PACKCHECK_GITHUB_COMMIT: "v0.7.0"
66+
PACKCHECK_GITHUB_COMMIT: "v0.7.1"
6767

6868
# Override the temp directory to avoid sed escaping issues
6969
# See https://github.com/haskell/cabal/issues/5386

packcheck.cabal

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: packcheck
2-
version: 0.7.0
2+
version: 0.7.1
33
synopsis: Universal build and CI testing for Haskell packages
44
description:
55
This package contains a universal CI/build script @packcheck.sh@ and config
@@ -29,7 +29,9 @@ homepage: https://github.com/composewell/packcheck
2929
bug-reports: https://github.com/composewell/packcheck/issues
3030
license: BSD3
3131
license-file: LICENSE
32-
tested-with: GHC==9.8.1
32+
tested-with: GHC==9.12.1
33+
, GHC==9.10.1
34+
, GHC==9.8.4
3335
, GHC==9.6.3
3436
, GHC==9.4.8
3537
, GHC==9.2.8

packcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Utility functions
2121
#------------------------------------------------------------------------------
2222

23-
PACKCHECK_VERSION=0.7.0
23+
PACKCHECK_VERSION=0.7.1
2424

2525
show_version() {
2626
echo "packcheck version $PACKCHECK_VERSION"

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
resolver: lts-21.24
1+
resolver: lts-23.9
22
packages:
33
- '.'

0 commit comments

Comments
 (0)