From cf32cb72cedd09e7350138e7d15997857da77a2c Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 7 Jan 2026 10:18:06 +0100 Subject: [PATCH] Allow time-1.15; bump CI to GHC 9.14 --- .github/workflows/haskell.yml | 34 ++++++++++++++++++---------------- HsOpenSSL.cabal | 10 ++++++---- README.md | 4 +--- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 7327c52..4c05da5 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -1,4 +1,4 @@ -name: Haskell CI +name: Cabal on: push: @@ -21,10 +21,11 @@ jobs: - "9.0.2" - "9.2.8" - "9.4.8" - - "9.6.6" + - "9.6.7" - "9.8.4" - - "9.10.1" - - "9.12.1" + - "9.10.3" + - "9.12.2" + - "9.14.1" # FIXME: Add windows-latest back to CI once it is passing. os: [ubuntu-latest] @@ -38,19 +39,20 @@ jobs: # Warning: Couldn't figure out LLVM version! # Make sure you have installed LLVM between [9 and 13) include: - - {ghc: "8.0.2" , os: "macos-13"} - - {ghc: "8.2.2" , os: "macos-13"} - - {ghc: "8.4.4" , os: "macos-13"} - - {ghc: "8.6.5" , os: "macos-13"} - - {ghc: "8.8.4" , os: "macos-13"} - - {ghc: "8.10.7", os: "macos-13"} - - {ghc: "9.0.2" , os: "macos-13"} + - {ghc: "8.0.2" , os: "macos-15-intel"} + - {ghc: "8.2.2" , os: "macos-15-intel"} + - {ghc: "8.4.4" , os: "macos-15-intel"} + - {ghc: "8.6.5" , os: "macos-15-intel"} + - {ghc: "8.8.4" , os: "macos-15-intel"} + - {ghc: "8.10.7", os: "macos-15-intel"} + - {ghc: "9.0.2" , os: "macos-15-intel"} - {ghc: "9.2.8" , os: "macos-latest"} - {ghc: "9.4.8" , os: "macos-latest"} - - {ghc: "9.6.6" , os: "macos-latest"} + - {ghc: "9.6.7" , os: "macos-latest"} - {ghc: "9.8.4" , os: "macos-latest"} - - {ghc: "9.10.1", os: "macos-latest"} - - {ghc: "9.12.1", os: "macos-latest"} + - {ghc: "9.10.3", os: "macos-latest"} + - {ghc: "9.12.2", os: "macos-latest"} + - {ghc: "9.14.1", os: "macos-latest"} env: # OpenSSL is installed in a non-standard location in MacOS. See # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-latest-Readme.md @@ -130,7 +132,7 @@ jobs: shell: bash run: echo '${{ steps.cabal-store.outputs.cabal-store }}' - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: "[PowerShell] Add build script path" if: runner.os == 'Windows' @@ -176,7 +178,7 @@ jobs: cat dist-newstyle/cache/plan.json | jq -r '."install-plan"[].id' | sort | uniq > dependencies.txt - name: Cache Cabal store - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ steps.cabal-store.outputs.cabal-store }} key: cache-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('dependencies.txt') }} diff --git a/HsOpenSSL.cabal b/HsOpenSSL.cabal index b450b1b..ba243c5 100644 --- a/HsOpenSSL.cabal +++ b/HsOpenSSL.cabal @@ -1,3 +1,4 @@ +Cabal-Version: 1.18 Name: HsOpenSSL Synopsis: Partial OpenSSL binding for Haskell Description: @@ -19,7 +20,6 @@ Stability: stable Homepage: https://github.com/haskell-cryptography/HsOpenSSL Bug-Reports: https://github.com/haskell-cryptography/HsOpenSSL/issues Category: Cryptography -Cabal-Version: 1.18 Tested-With: GHC ==8.0.2 || ==8.2.2 @@ -31,8 +31,10 @@ Tested-With: || ==9.2.8 || ==9.4.8 || ==9.6.6 - || ==9.8.1 - || ==9.10.1 + || ==9.8.4 + || ==9.10.3 + || ==9.12.2 + || ==9.14.1 Build-Type: Simple Extra-Doc-Files: AUTHORS @@ -84,7 +86,7 @@ Library base >= 4.8 && < 5, bytestring >= 0.9 && < 0.13, network >= 2.1 && < 3.3, - time >= 1.5 && < 1.15 + time >= 1.5 && < 1.16 Build-Tools: hsc2hs >= 0.67 diff --git a/README.md b/README.md index ca84865..5ba623c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ HsOpenSSL -========== - -[![Build Status](https://travis-ci.org/vshabanov/HsOpenSSL.svg?branch=master)](https://travis-ci.org/vshabanov/HsOpenSSL) +========= HsOpenSSL is an (incomplete) OpenSSL binding for Haskell. It can generate RSA and DSA keys, read and write PEM files, generate message