From ad4523cc2ee6322afdb36ef2cf608ed633d4fb4e Mon Sep 17 00:00:00 2001 From: Brian McKeon <135748266+brianjosephmckeon@users.noreply.github.com> Date: Wed, 7 Feb 2024 09:06:06 -0500 Subject: [PATCH] Prepare 0.2.13.2 release. Use new .github workflows. Restore Data.Bytes.Text.Utf8.toText. --- .github/workflows/build.yaml | 5 ++--- .github/workflows/release.yaml | 4 +--- CHANGELOG.md | 4 ++++ byteslice.cabal | 36 ++++++++++++++++++++-------------- cabal.project | 3 +++ src/Data/Bytes/Text/Utf8.hs | 2 +- 6 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 cabal.project diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 085bbaf..db62eaa 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: byteslice.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/CHANGELOG.md b/CHANGELOG.md index 81abdca..80211fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for byteslice +## 0.2.13.2 -- 2024-02-06 + +* Restore `Data.Bytes.Text.Utf8.toText`. + ## 0.2.13.1 -- 2024-02-01 * Update package metadata. diff --git a/byteslice.cabal b/byteslice.cabal index 00fef70..917c12c 100644 --- a/byteslice.cabal +++ b/byteslice.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: byteslice -version: 0.2.13.1 +version: 0.2.13.2 synopsis: Slicing managed and unmanaged memory description: This library provides types that allow the user to talk about a slice of @@ -16,13 +16,22 @@ author: Andrew Martin maintainer: amartin@layer3com.com copyright: 2020 Andrew Martin category: Data -extra-doc-files: CHANGELOG.md +extra-doc-files: + CHANGELOG.md + README.md + +tested-with: GHC ==9.4.8 || ==9.6.3 || ==9.8.1 + +common build-settings + default-language: Haskell2010 + ghc-options: -Wall -Wunused-packages flag avoid-rawmemchr default: True description: Avoid using rawmemchr which is non-portable GNU libc only library + import: build-settings exposed-modules: Data.Bytes Data.Bytes.Chunks @@ -60,7 +69,7 @@ library , vector >=0.12 && <0.14 hs-source-dirs: src - ghc-options: -Wall -O2 + ghc-options: -O2 if impl(ghc >=9.2) hs-source-dirs: src-new-reps @@ -74,7 +83,6 @@ library else hs-source-dirs: src-no-ghc-cstrlen - default-language: Haskell2010 include-dirs: include includes: bs_custom.h install-includes: bs_custom.h @@ -84,11 +92,10 @@ library cc-options: -DAVOID_RAWMEMCHR=1 test-suite test - default-language: Haskell2010 - type: exitcode-stdio-1.0 - hs-source-dirs: test - main-is: Main.hs - ghc-options: -Wall -O2 + import: build-settings + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: Main.hs build-depends: , base >=4.11.1 && <5 , byteslice @@ -102,17 +109,16 @@ test-suite test , transformers benchmark bench - type: exitcode-stdio-1.0 + import: build-settings + type: exitcode-stdio-1.0 build-depends: , base , byteslice , gauge - , primitive - ghc-options: -Wall -O2 - default-language: Haskell2010 - hs-source-dirs: bench - main-is: Main.hs + ghc-options: -O2 + hs-source-dirs: bench + main-is: Main.hs source-repository head type: git diff --git a/cabal.project b/cabal.project new file mode 100644 index 0000000..f39685f --- /dev/null +++ b/cabal.project @@ -0,0 +1,3 @@ +-- 2024-02-06: Including this to make "cabal test" work on build machine. +packages: . +tests: True diff --git a/src/Data/Bytes/Text/Utf8.hs b/src/Data/Bytes/Text/Utf8.hs index 7026bfa..7510e7e 100644 --- a/src/Data/Bytes/Text/Utf8.hs +++ b/src/Data/Bytes/Text/Utf8.hs @@ -9,7 +9,7 @@ module Data.Bytes.Text.Utf8 , fromText #endif #if MIN_VERSION_text(2,1,0) - -- , toText + , toText #endif ) where