diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 085bbaf..33ebc49 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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: base62.cabal diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index bd0bbd5..9411962 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -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 diff --git a/base62.cabal b/base62.cabal index dc22191..4a4d6cc 100644 --- a/base62.cabal +++ b/base62.cabal @@ -12,9 +12,15 @@ maintainer: amartin@layer3com.com copyright: 2019 Andrew Martin category: Data 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 - exposed-modules: Data.Word.Base62 + import: build-settings + exposed-modules: Data.Word.Base62 build-depends: , base >=4.17 && <5 , bytebuild >=0.3.4 && <0.4 @@ -26,15 +32,14 @@ library , text-short >=0.1.5 && <0.2 , wide-word >=0.1.0.8 && <0.2 - 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 build-depends: , base >=4.12.0.0 && <5 , base62 diff --git a/test/Main.hs b/test/Main.hs index a8c1d55..b755bb4 100644 --- a/test/Main.hs +++ b/test/Main.hs @@ -1,7 +1,7 @@ {-# LANGUAGE LambdaCase #-} {-# OPTIONS_GHC -fno-warn-orphans #-} -import Control.Applicative (liftA2) +-- import Control.Applicative (liftA2) import Data.Bits ((.&.)) import Data.Char (chr) import Data.Primitive (ByteArray)