Skip to content

Commit

Permalink
support ghc-9.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchellwrosen committed May 16, 2024
1 parent 01390c0 commit d8e8c30
Show file tree
Hide file tree
Showing 11 changed files with 277 additions and 240 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.17.20231010
# version: 0.19.20240513
#
# REGENDATA ("0.17.20231010",["github","timer-wheel.cabal"])
# REGENDATA ("0.19.20240513",["github","timer-wheel.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -23,24 +23,24 @@ jobs:
timeout-minutes:
60
container:
image: buildpack-deps:bionic
image: buildpack-deps:jammy
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- compiler: ghc-9.8.1
- compiler: ghc-9.10.1
compilerKind: ghc
compilerVersion: 9.8.1
compilerVersion: 9.10.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.6.3
- compiler: ghc-9.8.2
compilerKind: ghc
compilerVersion: 9.6.3
compilerVersion: 9.8.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.7
- compiler: ghc-9.6.5
compilerKind: ghc
compilerVersion: 9.4.7
compilerVersion: 9.6.5
setup-method: ghcup
allow-failure: false
fail-fast: false
Expand All @@ -50,10 +50,10 @@ jobs:
apt-get update
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
Expand All @@ -71,7 +71,7 @@ jobs:
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: source
- name: initial cabal.project for sdist
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
cabal-plan
- name: restore cache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
rm -f cabal.project.local
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: save cache
uses: actions/cache/save@v3
uses: actions/cache/save@v4
if: always()
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
Expand Down
19 changes: 12 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
## [1.0.0] - 2023-10-10
## [1.0.0.1] - May 16, 2024

- Fix `term-variable-capture` warnings
- Require at least GHC 9.2

## [1.0.0] - October 10, 2023

- Add `count`, which returns the number of timers in a timer wheel
- Add `Seconds` type alias for readability
Expand All @@ -12,19 +17,19 @@
- Improve the resolution of timers from microseconds to nanoseconds
- Simplify and optimize internals

## [0.4.0.1] - 2022-11-05
## [0.4.0.1] - November 5, 2022

- Fix inaccurate haddock on `recurring`

## [0.4.0] - 2022-11-05
## [0.4.0] - November 5, 2022

- Add `create`
- Rename `Data.TimerWheel` to `TimerWheel`
- Swap out `vector` for `array`
- Treat negative delays as 0
- Drop support for GHC < 8.6

## [0.3.0] - 2020-06-18
## [0.3.0] - June 18, 2020

- Add `with`
- Add support for GHC 8.8, GHC 8.10
Expand All @@ -38,11 +43,11 @@
- Remove `InvalidTimerWheelConfig` exception. `error` is used instead
- Remove support for GHC < 8.6

## [0.2.0.1] - 2019-05-19
## [0.2.0.1] - May 19, 2019

- Swap out `ghc-prim` and `primitive` for `vector`

## [0.2.0] - 2019-02-03
## [0.2.0] - February 3, 2019

- Add `destroy` function, for reaping the background thread
- Add `recurring_` function
Expand All @@ -57,6 +62,6 @@ spin forever and peg a CPU
- Rename `new` to `create`
- Make recurring timers more accurate

## [0.1.0] - 2018-07-18
## [0.1.0] - July 18, 2018

- Initial release
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2018-2023 Mitchell Rosen, Travis Staton
Copyright 2018-2024 Mitchell Dalvi Rosen, Travis Staton

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Expand Down
Loading

0 comments on commit d8e8c30

Please sign in to comment.