Merge pull request #1 from sorki/srk/chores

Chores, CI

Author: sorki

.github/workflows/ci.yaml

@@ -0,0 +1,53 @@
+# Code generated by dhall-to-yaml.  DO NOT EDIT.
+jobs:
+  build:
+    name: "GHC ${{ matrix.ghc }}, Cabal ${{ matrix.cabal }}, OS ${{ matrix.os }}"
+    "runs-on": "${{ matrix.os }}"
+    steps:
+    - name: "Install libzrmq3-dev"
+      run: "sudo apt install libzmq3-dev"
+    - uses: "actions/checkout@v4"
+      with:
+        submodules: recursive
+    - id: "setup-haskell-cabal"
+      uses: "haskell-actions/setup@v2"
+      with:
+        "cabal-version": "${{ matrix.cabal }}"
+        "ghc-version": "${{ matrix.ghc }}"
+    - name: Update Hackage repository
+      run: cabal update
+    - name: cabal.project.local.ci
+      run: |
+        if [ -e cabal.project.local.ci ]; then
+          cp cabal.project.local.ci cabal.project.local
+        fi
+    - name: freeze
+      run: "cabal freeze --enable-tests --enable-benchmarks"
+    - uses: "actions/cache@v3"
+      with:
+        key: "${{ matrix.os }}-${{ matrix.ghc }}-${{ matrix.cabal}}-${{ hashFiles('cabal.project.freeze') }}"
+        path: |
+          ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
+          dist-newstyle
+    - name: Install dependencies
+      run: "cabal build all --enable-tests --enable-benchmarks --only-dependencies"
+    - name: build all
+      run: "cabal build all --enable-tests --enable-benchmarks"
+    - name: test all
+      run: "cabal test all --enable-tests"
+    - name: haddock all
+      run: cabal haddock all
+    strategy:
+      matrix:
+        cabal:
+        - '3.10'
+        ghc:
+        - '9.6.3'
+        os:
+        - "ubuntu-latest"
+name: Haskell CI
+'on':
+  pull_request: {}
+  push: {}
+  schedule:
+  - cron: "4 20 10 * *"

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version [0.1.5.1](https://github.com/sorki/haskell-zre/compare/0.1.5.0...0.1.5.1) (2023-11-28)
+
+* Fix missing `void` import for GHC9.6.3
+
 # Version [0.1.5.0](https://github.com/sorki/haskell-zre/compare/0.1.4.0...0.1.5.0) (2022-02-28)
 
 * Use `attoparsec 0.14`

ci.dhall

@@ -0,0 +1,17 @@
+let haskellCi =
+      https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
+
+let defSteps = haskellCi.defaultCabalSteps
+
+in  haskellCi.generalCi
+      ( defSteps
+        with extraSteps.pre
+             =
+              defSteps.extraSteps.pre
+            # [ haskellCi.BuildStep.Name
+                  { name = "Install libzrmq3-dev"
+                  , run = "sudo apt install libzmq3-dev"
+                  }
+              ]
+      )
+      haskellCi.DhallMatrix::{=}

ci.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# Script by @fisx
+
+set -eo pipefail
+
+# cd into the dir where this script is placed
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+
+echo "regenerating .github/workflows/ci.yaml..."
+
+mkdir -p .github/workflows/
+which dhall-to-yaml-ng || cabal install dhall-yaml
+dhall-to-yaml-ng --generated-comment --file ci.dhall > .github/workflows/ci.yaml

src/Network/ZRE.hs

@@ -91,7 +91,7 @@ runIface s port (iface, ipv4, ipv6) = do
 runZre :: ZRE a -> IO ()
 runZre app = runZreParse (pure ()) (const app)
 
--- | Run with config file loaded from the enviornment variable ENVCFG
+-- | Run with config file loaded from the environment variable ENVCFG
 -- (@/etc/zre.conf@ or @~/.zre.conf@), possibly overriden by command-line options.
 --
 -- Accepts another `optparse-applicative` `Parser` for extending

src/Network/ZRE/Parse.hs

@@ -25,6 +25,7 @@ parseCmd :: Parser API
 parseCmd =
       DoJoin . mkGroup  <$> (string "join" *> lskip *> word)
   <|> DoLeave . mkGroup <$> (string "leave" *> lskip *> word)
+  -- TODO quoted shouts
   <|> DoShout <$> (string "shout" *> lskip *> (mkGroup <$> word)) <*> (lskip *> word)
   <|> DoWhisper <$> (string "whisper" *> uuid) <*> lw
   <|> DoDebug <$> (string "debug" *> pure True)

src/Network/ZRE/Types.hs

@@ -1,9 +1,9 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+
 module Network.ZRE.Types where
 
 import Control.Monad.Reader
@@ -20,6 +20,7 @@ import Data.Default
 import Data.ZRE hiding (Shout, Whisper) -- (Name, Seq, Group, Groups, GroupSeq, Headers, Content, ZRECmd, ZREMsg)
 import System.ZMQ4.Endpoint
 
+import qualified Control.Monad
 
 isec :: (Num a) => a -> a
 isec  = (*1000000)
@@ -153,7 +154,10 @@ readZ = do
 unReadZ :: Event -> ZRE ()
 unReadZ x = do
   (e, _) <- ask
-  void $ liftIO $ atomically $ unGetTBQueue e x
+  Control.Monad.void
+    $ liftIO
+    $ atomically
+    $ unGetTBQueue e x
 
 writeZ :: API -> ZRE ()
 writeZ x = do

zre.cabal

@@ -1,5 +1,5 @@
 name:                zre
-version:             0.1.5.0
+version:             0.1.5.1
 synopsis:            ZRE protocol implementation
 description:         Peer-to-peer local area networking with reliable group messaging
                      and automatic peer discovery.