Skip to content

Commit 2d6f18c

Browse files
Use new .github workflows.
Fix bug-reports field in cabal file.
1 parent 7916872 commit 2d6f18c

File tree

4 files changed

+16
-20
lines changed

4 files changed

+16
-20
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66

77
jobs:
88
call-workflow:
9-
uses: byteverse/.github/.github/workflows/build.yaml@main
10-
secrets: inherit
9+
uses: byteverse/.github/.github/workflows/build-matrix.yaml@main
1110
with:
12-
release: false
11+
cabal-file: json-query.cabal

.github/workflows/release.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@ on:
66

77
jobs:
88
call-workflow:
9-
uses: byteverse/.github/.github/workflows/build.yaml@main
9+
uses: byteverse/.github/.github/workflows/release.yaml@main
1010
secrets: inherit
11-
with:
12-
release: true

Setup.hs

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

json-query.cabal

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description:
88
only query JSON. They do not update it.
99

1010
homepage: https://github.com/byteverse/json-query
11-
bug-reports: https://github.com/byteverse/json-query
11+
bug-reports: https://github.com/byteverse/json-query/issues
1212
license: BSD-3-Clause
1313
license-file: LICENSE
1414
author: Andrew Martin
@@ -17,8 +17,14 @@ copyright: 2020 Andrew Martin
1717
category: Data
1818
build-type: Simple
1919
extra-doc-files: CHANGELOG.md
20+
tested-with: GHC ==9.4.8 || ==9.6.3 || ==9.8.1
21+
22+
common build-settings
23+
default-language: Haskell2010
24+
ghc-options: -Wall -Wunused-packages
2025

2126
library
27+
import: build-settings
2228
exposed-modules:
2329
Json.Arrow
2430
Json.Context
@@ -28,7 +34,6 @@ library
2834
Json.Path
2935

3036
build-depends:
31-
, array-chunks >=0.1.2 && <0.2
3237
, base >=4.12 && <5
3338
, bytebuild >=0.3.5 && <0.4
3439
, bytestring >=0.10 && <0.12
@@ -41,25 +46,21 @@ library
4146
, text-short >=0.1.3 && <0.2
4247
, transformers >=0.5.6 && <0.7
4348

44-
hs-source-dirs: src
45-
default-language: Haskell2010
46-
ghc-options: -Wall -O2
49+
hs-source-dirs: src
50+
ghc-options: -O2
4751

4852
test-suite test
49-
default-language: Haskell2010
50-
type: exitcode-stdio-1.0
51-
hs-source-dirs: test
52-
main-is: Main.hs
53+
import: build-settings
54+
type: exitcode-stdio-1.0
55+
hs-source-dirs: test
56+
main-is: Main.hs
5357
other-modules:
5458
Arrowy
5559
DogHouse
5660
Monadic
5761

58-
ghc-options: -Wall -O2
5962
build-depends:
60-
, array-chunks
6163
, base >=4.12.0.0 && <5
62-
, bytebuild
6364
, byteslice >=0.1.3
6465
, bytestring
6566
, hspec >=2.11.7

0 commit comments

Comments
 (0)