Skip to content

Commit

Permalink
build: GitHub CI
Browse files Browse the repository at this point in the history
  • Loading branch information
supki committed Oct 9, 2024
1 parent 41c1ca1 commit b1f1197
Show file tree
Hide file tree
Showing 17 changed files with 350 additions and 189 deletions.
28 changes: 0 additions & 28 deletions .circleci/config.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .ghci
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
:set -Wall
:set -Wno-incomplete-uni-patterns
:set -isrc
:set -itest
:set -XImportQualifiedPost
196 changes: 196 additions & 0 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
# This GitHub workflow config has been generated by a script via
#
# haskell-ci 'github' 'aeson-match-qq.cabal'
#
# To regenerate the script (for example after adjusting tested-with) run
#
# haskell-ci regenerate
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.18.1
#
# REGENDATA ("0.18.1",["github","aeson-match-qq.cabal"])
#
name: Haskell-CI
on:
- push
- pull_request
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
runs-on: ubuntu-20.04
timeout-minutes:
60
container:
image: buildpack-deps:22.04
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- compiler: ghc-9.8.2
compilerKind: ghc
compilerVersion: 9.8.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.6.4
compilerKind: ghc
compilerVersion: 9.6.4
setup-method: ghcup
allow-failure: false
fail-fast: false
steps:
- name: apt
run: |
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.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.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
HCVER: ${{ matrix.compilerVersion }}
- name: Set PATH and environment variables
run: |
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
HCDIR=/opt/$HCKIND/$HCVER
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$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"
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
HCVER: ${{ matrix.compilerVersion }}
- name: env
run: |
env
- name: write cabal config
run: |
mkdir -p $CABAL_DIR
cat >> $CABAL_CONFIG <<EOF
remote-build-reporting: anonymous
write-ghc-environment-files: never
remote-repo-cache: $CABAL_DIR/packages
logs-dir: $CABAL_DIR/logs
world-file: $CABAL_DIR/world
extra-prog-path: $CABAL_DIR/bin
symlink-bindir: $CABAL_DIR/bin
installdir: $CABAL_DIR/bin
build-summary: $CABAL_DIR/logs/build.log
store-dir: $CABAL_DIR/store
install-dirs user
prefix: $CABAL_DIR
repository hackage.haskell.org
url: http://hackage.haskell.org/
EOF
cat >> $CABAL_CONFIG <<EOF
program-default-options
ghc-options: $GHCJOBS +RTS -M3G -RTS
EOF
cat $CABAL_CONFIG
- name: versions
run: |
$HC --version || true
$HC --print-project-git-commit-id || true
$CABAL --version || true
- name: update cabal index
run: |
$CABAL v2-update -v
- name: install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
rm -f cabal-plan.xz
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: checkout
uses: actions/checkout@v3
with:
path: source
- name: initial cabal.project for sdist
run: |
touch cabal.project
echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
cat cabal.project
- name: sdist
run: |
mkdir -p sdist
$CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
- name: unpack
run: |
mkdir -p unpacked
find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
- name: generate cabal.project
run: |
PKGDIR_aeson_match_qq="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/aeson-match-qq-[0-9.]*')"
echo "PKGDIR_aeson_match_qq=${PKGDIR_aeson_match_qq}" >> "$GITHUB_ENV"
rm -f cabal.project cabal.project.local
touch cabal.project
touch cabal.project.local
echo "packages: ${PKGDIR_aeson_match_qq}" >> cabal.project
echo "package aeson-match-qq" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(aeson-match-qq)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
- name: dump install plan
run: |
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
cabal-plan
- name: restore cache
uses: actions/cache/restore@v3
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
- name: install dependencies
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all
- name: build w/o tests
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: build
run: |
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
- name: tests
run: |
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
- name: cabal check
run: |
cd ${PKGDIR_aeson_match_qq} || false
${CABAL} -vnormal check || true
- name: haddock
run: |
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
# - name: unconstrained build
# run: |
# rm -f cabal.project.local
# $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: save cache
uses: actions/cache/save@v3
if: always()
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
15 changes: 12 additions & 3 deletions aeson-match-qq.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand All @@ -16,6 +16,9 @@ copyright: Matvey Aksenov 2022
license: BSD2
license-file: LICENSE
build-type: Simple
tested-with:
GHC==9.6.5
, GHC==9.8.2
extra-source-files:
README.markdown
CHANGELOG.markdown
Expand All @@ -36,10 +39,13 @@ library
Paths_aeson_match_qq
hs-source-dirs:
src
ghc-options: -funbox-strict-fields -Wall
default-extensions:
ImportQualifiedPost
ghc-options: -funbox-strict-fields -Wall -Wno-incomplete-uni-patterns
build-depends:
aeson
, attoparsec
, attoparsec-aeson
, base >=4.14 && <5
, bytestring
, case-insensitive
Expand All @@ -58,12 +64,15 @@ test-suite spec
type: exitcode-stdio-1.0
main-is: Spec.hs
other-modules:
Aeson.Match.QQ.Internal.ParseSpec
Aeson.Match.QQ.Internal.PrettyPrintSpec
Aeson.Match.QQSpec
Paths_aeson_match_qq
hs-source-dirs:
test
ghc-options: -Wall -threaded -with-rtsopts=-N
default-extensions:
ImportQualifiedPost
ghc-options: -Wall -Wno-incomplete-uni-patterns -threaded -with-rtsopts=-N
build-depends:
aeson
, aeson-match-qq
Expand Down
9 changes: 9 additions & 0 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ extra-source-files:
- README.markdown
- CHANGELOG.markdown
github: supki/aeson-match-qq
tested-with:
- GHC==9.6.5
- GHC==9.8.2

default-extensions:
- ImportQualifiedPost

dependencies:
- base >= 4.14 && < 5
Expand All @@ -18,6 +24,7 @@ library:
dependencies:
- aeson
- attoparsec
- attoparsec-aeson
- bytestring
- case-insensitive
- containers
Expand All @@ -34,6 +41,7 @@ library:
ghc-options:
- -funbox-strict-fields
- -Wall
- -Wno-incomplete-uni-patterns
# - -Werror

tests:
Expand All @@ -50,6 +58,7 @@ tests:
Spec.hs
ghc-options:
- -Wall
- -Wno-incomplete-uni-patterns
# - -Werror
- -threaded
- -with-rtsopts=-N
8 changes: 3 additions & 5 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
{ pkgs ? import <nixpkgs> {}
, ghc ? pkgs.haskell.compiler.ghc902
, stack ? pkgs.stack
, ghc ? pkgs.haskell.compiler.ghc965
}:
pkgs.mkShell rec {
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;

buildInputs = with pkgs; [
ghc
hlint
stack
zlib
];

shellHook = ''
export \
LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath buildInputs}
chmod go-w . .ghci
'';
}
16 changes: 8 additions & 8 deletions src/Aeson/Match/QQ.hs
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ module Aeson.Match.QQ
, parse
) where

import Data.String (IsString(..))
import qualified Data.Text.Encoding as Text
import Language.Haskell.TH.Quote (QuasiQuoter(..))
import qualified Text.PrettyPrint as PP (render)
import qualified Text.PrettyPrint.HughesPJClass as PP (Pretty(..))
import Data.String (IsString(..))
import Data.Text.Encoding qualified as Text
import Language.Haskell.TH.Quote (QuasiQuoter(..))
import Text.PrettyPrint qualified as PP (render)
import Text.PrettyPrint.HughesPJClass qualified as PP (Pretty(..))

import Aeson.Match.QQ.Internal.Match
import Aeson.Match.QQ.Internal.Match
( match
, Error(..)
, TypeMismatch(..)
Expand All @@ -38,8 +38,8 @@ import Aeson.Match.QQ.Internal.Match
, Path(..)
, PathElem(..)
)
import Aeson.Match.QQ.Internal.Parse (parse)
import Aeson.Match.QQ.Internal.Value
import Aeson.Match.QQ.Internal.Parse (parse)
import Aeson.Match.QQ.Internal.Value
( Matcher(..)
, Box(..)
, Array
Expand Down
Loading

0 comments on commit b1f1197

Please sign in to comment.