Skip to content

Commit cf32cb7

Browse files
committed
Allow time-1.15; bump CI to GHC 9.14
1 parent 35f6c04 commit cf32cb7

3 files changed

Lines changed: 25 additions & 23 deletions

File tree

.github/workflows/haskell.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Haskell CI
1+
name: Cabal
22

33
on:
44
push:
@@ -21,10 +21,11 @@ jobs:
2121
- "9.0.2"
2222
- "9.2.8"
2323
- "9.4.8"
24-
- "9.6.6"
24+
- "9.6.7"
2525
- "9.8.4"
26-
- "9.10.1"
27-
- "9.12.1"
26+
- "9.10.3"
27+
- "9.12.2"
28+
- "9.14.1"
2829
# FIXME: Add windows-latest back to CI once it is passing.
2930
os: [ubuntu-latest]
3031

@@ -38,19 +39,20 @@ jobs:
3839
# Warning: Couldn't figure out LLVM version!
3940
# Make sure you have installed LLVM between [9 and 13)
4041
include:
41-
- {ghc: "8.0.2" , os: "macos-13"}
42-
- {ghc: "8.2.2" , os: "macos-13"}
43-
- {ghc: "8.4.4" , os: "macos-13"}
44-
- {ghc: "8.6.5" , os: "macos-13"}
45-
- {ghc: "8.8.4" , os: "macos-13"}
46-
- {ghc: "8.10.7", os: "macos-13"}
47-
- {ghc: "9.0.2" , os: "macos-13"}
42+
- {ghc: "8.0.2" , os: "macos-15-intel"}
43+
- {ghc: "8.2.2" , os: "macos-15-intel"}
44+
- {ghc: "8.4.4" , os: "macos-15-intel"}
45+
- {ghc: "8.6.5" , os: "macos-15-intel"}
46+
- {ghc: "8.8.4" , os: "macos-15-intel"}
47+
- {ghc: "8.10.7", os: "macos-15-intel"}
48+
- {ghc: "9.0.2" , os: "macos-15-intel"}
4849
- {ghc: "9.2.8" , os: "macos-latest"}
4950
- {ghc: "9.4.8" , os: "macos-latest"}
50-
- {ghc: "9.6.6" , os: "macos-latest"}
51+
- {ghc: "9.6.7" , os: "macos-latest"}
5152
- {ghc: "9.8.4" , os: "macos-latest"}
52-
- {ghc: "9.10.1", os: "macos-latest"}
53-
- {ghc: "9.12.1", os: "macos-latest"}
53+
- {ghc: "9.10.3", os: "macos-latest"}
54+
- {ghc: "9.12.2", os: "macos-latest"}
55+
- {ghc: "9.14.1", os: "macos-latest"}
5456
env:
5557
# OpenSSL is installed in a non-standard location in MacOS. See
5658
# https://github.com/actions/virtual-environments/blob/main/images/macos/macos-latest-Readme.md
@@ -130,7 +132,7 @@ jobs:
130132
shell: bash
131133
run: echo '${{ steps.cabal-store.outputs.cabal-store }}'
132134

133-
- uses: actions/checkout@v4
135+
- uses: actions/checkout@v6
134136

135137
- name: "[PowerShell] Add build script path"
136138
if: runner.os == 'Windows'
@@ -176,7 +178,7 @@ jobs:
176178
cat dist-newstyle/cache/plan.json | jq -r '."install-plan"[].id' | sort | uniq > dependencies.txt
177179
178180
- name: Cache Cabal store
179-
uses: actions/cache@v4
181+
uses: actions/cache@v5
180182
with:
181183
path: ${{ steps.cabal-store.outputs.cabal-store }}
182184
key: cache-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('dependencies.txt') }}

HsOpenSSL.cabal

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
Cabal-Version: 1.18
12
Name: HsOpenSSL
23
Synopsis: Partial OpenSSL binding for Haskell
34
Description:
@@ -19,7 +20,6 @@ Stability: stable
1920
Homepage: https://github.com/haskell-cryptography/HsOpenSSL
2021
Bug-Reports: https://github.com/haskell-cryptography/HsOpenSSL/issues
2122
Category: Cryptography
22-
Cabal-Version: 1.18
2323
Tested-With:
2424
GHC ==8.0.2
2525
|| ==8.2.2
@@ -31,8 +31,10 @@ Tested-With:
3131
|| ==9.2.8
3232
|| ==9.4.8
3333
|| ==9.6.6
34-
|| ==9.8.1
35-
|| ==9.10.1
34+
|| ==9.8.4
35+
|| ==9.10.3
36+
|| ==9.12.2
37+
|| ==9.14.1
3638
Build-Type: Simple
3739
Extra-Doc-Files:
3840
AUTHORS
@@ -84,7 +86,7 @@ Library
8486
base >= 4.8 && < 5,
8587
bytestring >= 0.9 && < 0.13,
8688
network >= 2.1 && < 3.3,
87-
time >= 1.5 && < 1.15
89+
time >= 1.5 && < 1.16
8890

8991
Build-Tools: hsc2hs >= 0.67
9092

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
HsOpenSSL
2-
==========
3-
4-
[![Build Status](https://travis-ci.org/vshabanov/HsOpenSSL.svg?branch=master)](https://travis-ci.org/vshabanov/HsOpenSSL)
2+
=========
53

64
HsOpenSSL is an (incomplete) OpenSSL binding for Haskell. It can
75
generate RSA and DSA keys, read and write PEM files, generate message

0 commit comments

Comments
 (0)