From c194d89c520e33fef563356bc584981a8f969970 Mon Sep 17 00:00:00 2001 From: Joris Dral Date: Mon, 23 Mar 2026 17:19:51 +0100 Subject: [PATCH 1/2] Release `botan-bindings-0.3.0.0`, release `botan-low-0.2.0.0` --- botan-bindings/CHANGELOG.md | 2 +- botan-bindings/botan-bindings.cabal | 4 ++-- botan-low/CHANGELOG.md | 2 +- botan-low/botan-low.cabal | 6 +++--- botan/botan.cabal | 2 +- cabal.project | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/botan-bindings/CHANGELOG.md b/botan-bindings/CHANGELOG.md index 86c306d..ce67fb9 100644 --- a/botan-bindings/CHANGELOG.md +++ b/botan-bindings/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## ?.?.?.? -- ????-??-?? +## 0.3.0.0 -- 2026-03-23 * BREAKING: for all newtypes with a record field name like `run*`, change the name to `ptr`. See PR's diff --git a/botan-bindings/botan-bindings.cabal b/botan-bindings/botan-bindings.cabal index b2844d2..26282a2 100644 --- a/botan-bindings/botan-bindings.cabal +++ b/botan-bindings/botan-bindings.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: botan-bindings -version: 0.2.0.0 +version: 0.3.0.0 synopsis: Raw Botan bindings description: Welcome to botan-bindings @@ -39,7 +39,7 @@ source-repository this type: git location: https://github.com/haskell-cryptography/botan subdir: botan-bindings - tag: botan-bindings-0.2.0.0 + tag: botan-bindings-0.3.0.0 flag pkg-config default: True diff --git a/botan-low/CHANGELOG.md b/botan-low/CHANGELOG.md index 54c76b1..e09f4f6 100644 --- a/botan-low/CHANGELOG.md +++ b/botan-low/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## ?.?.?.? -- ????-??-?? +## 0.2.0.0 -- 2026-03-23 * BREAKING: change more flags from numbers into datatypes. See PR [#113](https://github.com/haskell-cryptography/botan/pull/113). The flag diff --git a/botan-low/botan-low.cabal b/botan-low/botan-low.cabal index 408d95a..2364143 100644 --- a/botan-low/botan-low.cabal +++ b/botan-low/botan-low.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: botan-low -version: 0.1.0.0 +version: 0.2.0.0 synopsis: Low-level Botan bindings description: Welcome to botan-low @@ -50,7 +50,7 @@ source-repository this type: git location: https://github.com/haskell-cryptography/botan subdir: botan-low - tag: botan-low-0.1.0.0 + tag: botan-low-0.2.0.0 common warnings ghc-options: @@ -128,7 +128,7 @@ library build-depends: base >=4.16 && <4.22, - botan-bindings ^>=0.2, + botan-bindings ^>=0.3, bytestring >=0.11 && <0.13, deepseq >=1.1 && <2, text >=1.2 && <1.3 || >=2.0 && <2.2, diff --git a/botan/botan.cabal b/botan/botan.cabal index b62e38b..37f37f9 100644 --- a/botan/botan.cabal +++ b/botan/botan.cabal @@ -156,7 +156,7 @@ library build-depends: base >=4.16 && <4.22, - botan-low ^>=0.1, + botan-low ^>=0.2, bytestring >=0.11 && <0.13, deepseq >=1.1 && <2, text >=1.2 && <1.3 || >=2.0 && <2.2, diff --git a/cabal.project b/cabal.project index 9383132..542dbfe 100644 --- a/cabal.project +++ b/cabal.project @@ -1,7 +1,7 @@ index-state: -- Bump this if you need newer packages from Hackage - -- current date: release botan-low-0.1.0.0 and botan-bindings-0.2.0.0 - , hackage.haskell.org 2025-12-30T00:00:00Z + -- current date: release botan-low-0.2.0.0 and botan-bindings-0.3.0.0 + , hackage.haskell.org 2026-03-23T00:00:00Z packages: botan-bindings From 5d19e07d352bfb0376e94926e76a9e7b85d139ea Mon Sep 17 00:00:00 2001 From: Joris Dral Date: Mon, 23 Mar 2026 17:25:32 +0100 Subject: [PATCH 2/2] Remove the `fix-whitespace` check `stylish-haskell` already ensures proper use of whitespace in Haskell files --- .github/workflows/ci.yml | 21 -------------- scripts/format-fix-whitespace.sh | 49 -------------------------------- 2 files changed, 70 deletions(-) delete mode 100755 scripts/format-fix-whitespace.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7348c98..6426e1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -259,27 +259,6 @@ jobs: - name: 🎗️ Lint with cabal run: ./scripts/lint-cabal.sh - ################################################################################ - # Lint with fix-whitespace - ################################################################################ - whitespace: - name: "Fix whitespace" - runs-on: ubuntu-latest - timeout-minutes: 5 - steps: - - name: Checkout - uses: actions/checkout@v6 - - - name: Download fix-whitespace - run: | - curl -L -o fix-whitespace https://github.com/agda/fix-whitespace/releases/download/v0.1/fix-whitespace-0.1-linux.binary - chmod a+x fix-whitespace - - - name: Check whitespace - run: | - export PATH="$PWD:$PATH" - CHECK=true ./scripts/format-fix-whitespace.sh - ################################################################################ # Lint with stylish-haskell ################################################################################ diff --git a/scripts/format-fix-whitespace.sh b/scripts/format-fix-whitespace.sh deleted file mode 100755 index 41b963e..0000000 --- a/scripts/format-fix-whitespace.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -export LC_ALL=C.UTF-8 - -# POSIX compliant method for 'pipefail': -warn=$(mktemp) - -# Remove temporary file and exit 1 -fail () { - rm "$warn" - exit 1 -} - -# Remove temporary file and exit 0 -success () { - rm "$warn" - exit 0 -} - -# Check fix-whitespace version -fix_whitespace_expect_version="0.1" -if [ "${fix_whitespace}" = "" ]; then - fix_whitespace=$(which "fix-whitespace") - if [ "${fix_whitespace}" = "" ]; then - echo "Requires fix-whitespace ${fix_whitespace_expect_version}; no version found" - fail - fi -fi - -fix_whitespace_actual_version="$($fix_whitespace --version | head -n 1 | cut -d' ' -f2)" -if [ ! "${fix_whitespace_actual_version}" = "${fix_whitespace_expect_version}" ]; then - echo "Expected fix-whitespace ${fix_whitespace_expect_version}; version ${fix_whitespace_actual_version} found" - echo > "$warn" -fi - -# Format Haskell files with fix-whitespace -echo "Formatting Haskell source files with fix-whitespace version ${fix_whitespace_actual_version}..." -if [ "${CHECK}" = "true" ]; then - fix-whitespace --check --verbose -- **/*.hs || fail -else - fix-whitespace -- **/*.hs -fi - -# Check whether any warning was issued; on CI, warnings are errors -if [ "${CI}" = "true" ] && [ -s "$warn" ]; then - fail -else - success -fi