Skip to content

Commit

Permalink
Use new .github workflows.
Browse files Browse the repository at this point in the history
Fix bug-reports field in cabal file.
  • Loading branch information
brianjosephmckeon authored Feb 7, 2024
1 parent 7916872 commit 2d6f18c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 20 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:

jobs:
call-workflow:
uses: byteverse/.github/.github/workflows/build.yaml@main
secrets: inherit
uses: byteverse/.github/.github/workflows/build-matrix.yaml@main
with:
release: false
cabal-file: json-query.cabal
4 changes: 1 addition & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@ on:

jobs:
call-workflow:
uses: byteverse/.github/.github/workflows/build.yaml@main
uses: byteverse/.github/.github/workflows/release.yaml@main
secrets: inherit
with:
release: true
2 changes: 0 additions & 2 deletions Setup.hs

This file was deleted.

25 changes: 13 additions & 12 deletions json-query.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description:
only query JSON. They do not update it.

homepage: https://github.com/byteverse/json-query
bug-reports: https://github.com/byteverse/json-query
bug-reports: https://github.com/byteverse/json-query/issues
license: BSD-3-Clause
license-file: LICENSE
author: Andrew Martin
Expand All @@ -17,8 +17,14 @@ copyright: 2020 Andrew Martin
category: Data
build-type: Simple
extra-doc-files: CHANGELOG.md
tested-with: GHC ==9.4.8 || ==9.6.3 || ==9.8.1

common build-settings
default-language: Haskell2010
ghc-options: -Wall -Wunused-packages

library
import: build-settings
exposed-modules:
Json.Arrow
Json.Context
Expand All @@ -28,7 +34,6 @@ library
Json.Path

build-depends:
, array-chunks >=0.1.2 && <0.2
, base >=4.12 && <5
, bytebuild >=0.3.5 && <0.4
, bytestring >=0.10 && <0.12
Expand All @@ -41,25 +46,21 @@ library
, text-short >=0.1.3 && <0.2
, transformers >=0.5.6 && <0.7

hs-source-dirs: src
default-language: Haskell2010
ghc-options: -Wall -O2
hs-source-dirs: src
ghc-options: -O2

test-suite test
default-language: Haskell2010
type: exitcode-stdio-1.0
hs-source-dirs: test
main-is: Main.hs
import: build-settings
type: exitcode-stdio-1.0
hs-source-dirs: test
main-is: Main.hs
other-modules:
Arrowy
DogHouse
Monadic

ghc-options: -Wall -O2
build-depends:
, array-chunks
, base >=4.12.0.0 && <5
, bytebuild
, byteslice >=0.1.3
, bytestring
, hspec >=2.11.7
Expand Down

0 comments on commit 2d6f18c

Please sign in to comment.