Skip to content

Commit 107e65a

Browse files
TravisCardwellTravisCardwell
committed
Release 0.6.0.0
2 parents e61b7d5 + a1590f5 commit 107e65a

54 files changed

Lines changed: 4846 additions & 291 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
ghcvers_upper: ${{ steps.set-ghcvers.outputs.ghcvers_upper }}
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
- name: Set ghcvers
2525
id: set-ghcvers
2626
run: ./test-all.sh github >> $GITHUB_OUTPUT
@@ -35,9 +35,9 @@ jobs:
3535
ghc: ${{fromJSON(needs.config.outputs.ghcvers)}}
3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939
- name: Setup Haskell
40-
uses: haskell/actions/setup@v2
40+
uses: haskell-actions/setup@v2
4141
id: setup
4242
with:
4343
ghc-version: ${{ matrix.ghc }}
@@ -61,7 +61,7 @@ jobs:
6161
cabal v2-configure $CABAL_OPTS --disable-documentation
6262
cabal v2-build --dry-run $CABAL_OPTS
6363
- name: Restore Cached Dependencies
64-
uses: actions/cache/restore@v3
64+
uses: actions/cache/restore@v4
6565
id: cache
6666
with:
6767
path: ${{ steps.setup.outputs.cabal-store }}
@@ -70,7 +70,7 @@ jobs:
7070
- name: Install Dependencies
7171
run: cabal v2-build all $CABAL_OPTS --only-dependencies
7272
- name: Save Cached Dependencies
73-
uses: actions/cache/save@v3
73+
uses: actions/cache/save@v4
7474
if: ${{ !steps.cache.outputs.cache-hit
7575
|| steps.cache.outputs.cache-primary-key != steps.cache.outputs.cache-matched-key }}
7676
with:
@@ -93,9 +93,9 @@ jobs:
9393
ghc: ${{fromJSON(needs.config.outputs.ghcvers)}}
9494
steps:
9595
- name: Checkout
96-
uses: actions/checkout@v3
96+
uses: actions/checkout@v4
9797
- name: Setup Haskell
98-
uses: haskell/actions/setup@v2
98+
uses: haskell-actions/setup@v2
9999
id: setup
100100
with:
101101
ghc-version: ${{ matrix.ghc }}
@@ -114,7 +114,7 @@ jobs:
114114
CACHE_RESTORE_KEY="${RUNNER_OS}-$(date +%Y%m)-ghc-${GHC_VERSION}-stack-"
115115
echo "CACHE_RESTORE_KEY=${CACHE_RESTORE_KEY}" | tee -a "${GITHUB_ENV}"
116116
- name: Cache
117-
uses: actions/cache@v3
117+
uses: actions/cache@v4
118118
with:
119119
path: |
120120
~/.stack
@@ -138,9 +138,9 @@ jobs:
138138
ghc: ${{fromJSON(needs.config.outputs.ghcvers_lower)}}
139139
steps:
140140
- name: Checkout
141-
uses: actions/checkout@v3
141+
uses: actions/checkout@v4
142142
- name: Setup Haskell
143-
uses: haskell/actions/setup@v2
143+
uses: haskell-actions/setup@v2
144144
id: setup
145145
with:
146146
ghc-version: ${{ matrix.ghc }}
@@ -161,7 +161,7 @@ jobs:
161161
cabal v2-configure $CABAL_OPTS --disable-documentation
162162
cabal v2-build --dry-run $CABAL_OPTS
163163
- name: Restore Cached Dependencies
164-
uses: actions/cache/restore@v3
164+
uses: actions/cache/restore@v4
165165
id: cache
166166
with:
167167
path: ${{ steps.setup.outputs.cabal-store }}
@@ -170,7 +170,7 @@ jobs:
170170
- name: Install Dependencies
171171
run: cabal v2-build all $CABAL_OPTS --only-dependencies
172172
- name: Save Cached Dependencies
173-
uses: actions/cache/save@v3
173+
uses: actions/cache/save@v4
174174
if: ${{ !steps.cache.outputs.cache-hit
175175
|| steps.cache.outputs.cache-primary-key != steps.cache.outputs.cache-matched-key }}
176176
with:
@@ -193,9 +193,9 @@ jobs:
193193
ghc: ${{fromJSON(needs.config.outputs.ghcvers_upper)}}
194194
steps:
195195
- name: Checkout
196-
uses: actions/checkout@v3
196+
uses: actions/checkout@v4
197197
- name: Setup Haskell
198-
uses: haskell/actions/setup@v2
198+
uses: haskell-actions/setup@v2
199199
id: setup
200200
with:
201201
ghc-version: ${{ matrix.ghc }}
@@ -216,7 +216,7 @@ jobs:
216216
cabal v2-configure $CABAL_OPTS --disable-documentation
217217
cabal v2-build --dry-run $CABAL_OPTS
218218
- name: Restore Cached Dependencies
219-
uses: actions/cache/restore@v3
219+
uses: actions/cache/restore@v4
220220
id: cache
221221
with:
222222
path: ${{ steps.setup.outputs.cabal-store }}
@@ -225,7 +225,7 @@ jobs:
225225
- name: Install Dependencies
226226
run: cabal v2-build all $CABAL_OPTS --only-dependencies
227227
- name: Save Cached Dependencies
228-
uses: actions/cache/save@v3
228+
uses: actions/cache/save@v4
229229
if: ${{ !steps.cache.outputs.cache-hit
230230
|| steps.cache.outputs.cache-primary-key != steps.cache.outputs.cache-matched-key }}
231231
with:
@@ -244,13 +244,13 @@ jobs:
244244
strategy:
245245
fail-fast: false
246246
matrix:
247-
cabal: ['2.4.1.0', '3.0.0.0', '3.2.0.0', '3.4.1.0', '3.6.2.0', '3.8.1.0', '3.10.1.0']
248-
ghc: ['8.2.2']
247+
cabal: ['3.0.0.0']
248+
ghc: ['8.8.4']
249249
steps:
250250
- name: Checkout
251-
uses: actions/checkout@v3
251+
uses: actions/checkout@v4
252252
- name: Setup Haskell
253-
uses: haskell/actions/setup@v2
253+
uses: haskell-actions/setup@v2
254254
id: setup
255255
with:
256256
ghc-version: ${{ matrix.ghc }}
@@ -274,7 +274,7 @@ jobs:
274274
cabal v2-configure $CABAL_OPTS --disable-documentation
275275
cabal v2-build --dry-run $CABAL_OPTS
276276
- name: Restore Cached Dependencies
277-
uses: actions/cache/restore@v3
277+
uses: actions/cache/restore@v4
278278
id: cache
279279
with:
280280
path: ${{ steps.setup.outputs.cabal-store }}
@@ -283,7 +283,7 @@ jobs:
283283
- name: Install Dependencies
284284
run: cabal v2-build all $CABAL_OPTS --only-dependencies
285285
- name: Save Cached Dependencies
286-
uses: actions/cache/save@v3
286+
uses: actions/cache/save@v4
287287
if: ${{ !steps.cache.outputs.cache-hit
288288
|| steps.cache.outputs.cache-primary-key != steps.cache.outputs.cache-matched-key }}
289289
with:

‎CHANGELOG.md‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This project follows the [Haskell package versioning policy][PVP], with
44
versions in `A.B.C.D` format. `A` may be incremented arbitrarily for
55
non-technical reasons, but [semantic versioning][SemVer] is otherwise
66
followed, where `A.B` is the major version, `C` is the minor version, and `D`
7-
is the patch version. Initial development uses versions `0.0.0.D`, for which
7+
is the patch version. Initial development uses versions `0.0.C.D`, for which
88
every version is considered breaking.
99

1010
[PVP]: <https://pvp.haskell.org/>
@@ -24,6 +24,23 @@ following conventions:
2424

2525
[KaC]: <https://keepachangelog.com/en/1.0.0/>
2626

27+
## 0.6.0.0 (2024-12-30)
28+
29+
### Breaking
30+
31+
* Remove support for GHC 8.6, constraining lower bounds
32+
* Remove support for GHC 8.4, constraining lower bounds
33+
* Remove support for GHC 8.2, constraining lower bounds
34+
* Change minimal Cabal from 1.24 to 3.0
35+
36+
### Non-Breaking
37+
38+
* Bump `ansi-terminal` dependency version upper bound
39+
* Bump `base` dependency version upper bound
40+
* Bump `tasty` dependency version upper bound
41+
* Bump `text` dependency version upper bound
42+
* Vendor `HMock` and `explainable-predicates`
43+
2744
## 0.5.0.0 (2023-05-28)
2845

2946
### Breaking

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright (c) 2020-2023 Travis Cardwell
3+
Copyright (c) 2020-2024 Travis Cardwell
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ MODE ?= stack
1111
DESTDIR ?=
1212
PREFIX ?= /usr/local
1313

14-
DEB_CONTAINER ?= extremais/pkg-debian-stack:bullseye
15-
RPM_CONTAINER ?= extremais/pkg-fedora-stack:37
14+
DEB_CONTAINER ?= extremais/pkg-debian-stack:bookworm
15+
RPM_CONTAINER ?= extremais/pkg-fedora-stack:41
1616
MAINTAINER_NAME ?= Travis Cardwell
1717
MAINTAINER_EMAIL ?= travis.cardwell@extrema.is
1818

19-
TEST_DEB_CONTAINER ?= debian:bullseye
19+
TEST_DEB_CONTAINER ?= debian:bookworm
2020
TEST_DEB_ARCH ?= amd64
21-
TEST_RPM_CONTAINER ?= fedora:37
22-
TEST_RPM_OS ?= fc37
21+
TEST_RPM_CONTAINER ?= fedora:41
22+
TEST_RPM_OS ?= fc41
2323
TEST_RPM_ARCH ?= x86_64
2424

2525
##############################################################################
@@ -198,7 +198,6 @@ help: # show this help
198198
> @echo "Stack mode (MODE=stack)"
199199
> @echo " * Set CONFIG to specify a stack.yaml file."
200200
> @echo " * Set RESOLVER to specify a Stack resolver."
201-
> @echo " * Set STACK_NIX_PATH to specify a Stack Nix path."
202201
.PHONY: help
203202

204203
hlint: # run hlint on all Haskell source

‎VENDOR.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Vendored Dependencies
2+
3+
Some dependencies are vendored in order to support newer versions of GHC and
4+
other dependencies than the upstream package supports. This is generally done
5+
because the vendored packages are not maintained. Vendoring such packages
6+
allows me to update the vendored copies yet still publish to Hackage.
7+
8+
## `HMock`
9+
10+
* [Hackage](https://hackage.haskell.org/package/HMock)
11+
* [Repository](https://github.com/cdsmith/HMock)
12+
* License: BSD-3
13+
* Copyright: Copyright (c) 2021, Chris Smith
14+
15+
Vendored:
16+
17+
* [Repository](https://github.com/TravisCardwell/HMock/tree/vendored)
18+
* Upstream commit:
19+
[`275fba1c`](https://github.com/cdsmith/HMock/tree/275fba1cf7d2c1e5022254fa0e90d495fd7cd8b8)
20+
* Vendored commit:
21+
[`0bb7ba7f`](https://github.com/TravisCardwell/HMock/tree/0bb7ba7fc5bcd9d27049cd153bd313692b85aeb4)
22+
* The commit adding support for GHC 9.10 was merged, but Hackage has not
23+
been updated.
24+
* Bump `data-default` upper bound
25+
* Bump `extra` upper bound
26+
* Files: `test/Test/HMock*`
27+
28+
## `explainable-predicates`
29+
30+
* [Hackage](https://hackage.haskell.org/package/explainable-predicates)
31+
* [Repository](https://github.com/cdsmith/explainable-predicates)
32+
* License: BSD-3
33+
* Copyright: Copyright (c) 2021, Chris Smith
34+
35+
Vendored:
36+
37+
* [Repository](https://github.com/TravisCardwell/explainable-predicates/tree/vendored)
38+
* Upstream commit:
39+
[`7eca242b`](https://github.com/cdsmith/explainable-predicates/tree/7eca242b75c778b65298a045daa278aa51a29983)
40+
* Vendored commit: (same)
41+
* The commit adding support for GHC 9.10 was merged, but Hackage has not
42+
been updated.
43+
* Files: `test/Test/Predicates*`

‎app/LibOA.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- |
33
-- Module : LibOA
44
-- Description : supplementary functions for optparse-applicative
5-
-- Copyright : Copyright (c) 2019-2023 Travis Cardwell
5+
-- Copyright : Copyright (c) 2019-2024 Travis Cardwell
66
-- License : MIT
77
--
88
-- This is a collection of functions that I often use with

‎app/Main.hs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- |
33
-- Module : Main
44
-- Description : redact: hide secret text on the terminal
5-
-- Copyright : Copyright (c) 2020-2023 Travis Cardwell
5+
-- Copyright : Copyright (c) 2020-2024 Travis Cardwell
66
-- License : MIT
77
--
88
-- See the README for details.
@@ -44,7 +44,7 @@ import qualified System.Directory as Dir
4444
import qualified Options.Applicative as OA
4545

4646
-- (redact)
47-
import qualified Redact as Project
47+
import qualified Redact
4848
import qualified Redact.Markdown as Redact
4949
import qualified Redact.Monad.Terminal as RedactTerm
5050

@@ -177,16 +177,13 @@ getOptions = do
177177
parseArgs :: IO (Options Maybe)
178178
parseArgs
179179
= OA.execParser
180-
. OA.info (LibOA.helper <*> LibOA.versioner version <*> options)
180+
. OA.info (LibOA.helper <*> LibOA.versioner Redact.version <*> options)
181181
$ mconcat
182182
[ OA.fullDesc
183183
, OA.progDesc "hide secret text on the terminal"
184184
, OA.failureCode 2
185185
, OA.footerDoc $ Just footer
186186
]
187-
where
188-
version :: String
189-
version = "redact-haskell " ++ Project.version
190187

191188
options :: OA.Parser (Options Maybe)
192189
options = Options

‎cabal-8.2.2.project‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎cabal-9.4.5.project‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎cabal-9.6.2.project‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)