From 82d143ab1377d50c71ccbca616e9aa26eec2c308 Mon Sep 17 00:00:00 2001
From: Brian McKeon <bmckeon@layer3com.com>
Date: Tue, 6 Feb 2024 15:26:49 -0500
Subject: [PATCH] Use new .github workflows.

---
 .github/workflows/build.yaml   |  5 ++---
 .github/workflows/release.yaml |  4 +---
 array-builder.cabal            | 24 +++++++++++++-----------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 085bbaf..a391c11 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: array-builder.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/array-builder.cabal b/array-builder.cabal
index ef5dd7a..b560ae9 100644
--- a/array-builder.cabal
+++ b/array-builder.cabal
@@ -12,8 +12,14 @@ 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
+  import:          build-settings
   exposed-modules:
     Data.Builder
     Data.Builder.Catenable
@@ -21,7 +27,7 @@ library
     Data.Builder.Catenable.Text
     Data.Builder.ST
 
-  other-modules:    Compat
+  other-modules:   Compat
   build-depends:
     , array-chunks        >=0.1    && <0.2
     , base                >=4.12   && <5
@@ -30,10 +36,9 @@ library
     , bytestring          >=0.11.5 && <0.12
     , natural-arithmetic  >=0.1.3  && <0.3
     , primitive           >=0.6.4  && <0.10
-    , run-st              >=0.1    && <0.2
     , text-short          >=0.1.3  && <0.2
 
-  hs-source-dirs:   src
+  hs-source-dirs:  src
 
   if impl(ghc >=8.9)
     hs-source-dirs: src-post-8.9
@@ -41,22 +46,19 @@ library
   else
     hs-source-dirs: src-pre-8.9
 
-  default-language: Haskell2010
-  ghc-options:      -Wall -O2
+  ghc-options:     -O2
 
 test-suite test
-  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:
     , array-builder
     , base
     , tasty
     , tasty-hunit
 
-  ghc-options:      -Wall -O2
-  default-language: Haskell2010
-
 source-repository head
   type:     git
   location: git://github.com/byteverse/array-builder.git