Skip to content

Commit

Permalink
Prepare 0.2.13.2 release.
Browse files Browse the repository at this point in the history
Use new .github workflows.
Restore Data.Bytes.Text.Utf8.toText.
  • Loading branch information
brianjosephmckeon authored Feb 7, 2024
1 parent b6fa1f0 commit ad4523c
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 22 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: byteslice.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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
36 changes: 21 additions & 15 deletions byteslice.cabal
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,13 +16,22 @@ author: Andrew Martin
maintainer: [email protected]
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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- 2024-02-06: Including this to make "cabal test" work on build machine.
packages: .
tests: True
2 changes: 1 addition & 1 deletion src/Data/Bytes/Text/Utf8.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module Data.Bytes.Text.Utf8
, fromText
#endif
#if MIN_VERSION_text(2,1,0)
-- , toText
, toText
#endif
) where

Expand Down

0 comments on commit ad4523c

Please sign in to comment.