Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expand stack.yamls #39

Merged
merged 8 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,28 @@ jobs:
strategy:
matrix:
stack-yaml:
- stack-nightly.yaml # ghc-9.2
- stack.yaml # ghc-9.0
- stack-nightly.yaml # ghc-9.8
- stack.yaml # ghc-9.6
- stack-lts-21.25.yaml # ghc-9.4
- stack-lts-20.26.yaml # ghc-9.2
- stack-lts-19.33.yaml # ghc-9.0
- stack-lts-18.28.yaml # ghc-8.10
- stack-lts-16.31.yaml # ghc-8.8
- stack-lts-14.27.yaml # ghc-8.6
- stack-lts-12.26.yaml # ghc-8.4
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# See https://github.com/commercialhaskell/stack/issues/5159. To avoid
# this bug, we'll skip doctests generally and run them ourselves, only in
# the default job.
- id: stack
uses: freckle/stack-action@v4
uses: freckle/stack-action@v5
with:
stack-yaml: ${{ matrix.stack-yaml }}
stack-arguments: --coverage --skip doctest
stack-build-arguments: --coverage --skip doctest

- if: ${{ matrix.stack-yaml == 'stack.yaml' }}
run: |
Expand All @@ -57,7 +60,7 @@ jobs:
hlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: haskell/actions/hlint-setup@v2
- uses: haskell/actions/hlint-run@v2
with:
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/mergeabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Mergeabot

on:
pull_request:
schedule:
- cron: "0 0 * * *"

permissions:
contents: write
pull-requests: write

jobs:
mergeabot:
runs-on: ubuntu-latest
steps:
- uses: freckle/mergeabot-action@v1
with:
quarantine-days: -1
4 changes: 1 addition & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@ jobs:
- bcp47-orphans

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- id: tag
uses: freckle/haskell-tag-action@v1
with:
package-yaml: ${{ matrix.package }}/package.yaml
tag-prefix: ${{ matrix.package }}-v
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- if: steps.tag.outputs.tag
uses: freckle/stack-upload-action@v2
Expand Down
6 changes: 4 additions & 2 deletions .restyled.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
- brittany
- stylish-haskell
restylers:
- fourmolu
- "!stylish-haskell"
- "*"
57 changes: 0 additions & 57 deletions .stylish-haskell.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion bcp47-orphans/library/Data/BCP47/Csv.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Data.BCP47.Csv () where

import Data.BCP47 (BCP47, fromText, toText)
import Data.Csv (FromField(..), ToField(..))
import Data.Csv (FromField (..), ToField (..))
import Data.Text (unpack)

instance ToField BCP47 where
Expand Down
2 changes: 1 addition & 1 deletion bcp47-orphans/library/Data/BCP47/Hashable.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Data.BCP47.Hashable () where

import Data.BCP47 (BCP47, toText)
import Data.Hashable (Hashable(..))
import Data.Hashable (Hashable (..))

instance Hashable BCP47 where
hashWithSalt i = hashWithSalt i . toText
5 changes: 2 additions & 3 deletions bcp47-orphans/library/Data/BCP47/HttpApiData.hs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{-# OPTIONS_GHC -fno-warn-orphans #-}

module Data.BCP47.HttpApiData
()
module Data.BCP47.HttpApiData ()
where

import Data.BCP47 (BCP47, fromText, toText)
import Web.HttpApiData (FromHttpApiData(..), ToHttpApiData(..))
import Web.HttpApiData (FromHttpApiData (..), ToHttpApiData (..))

instance ToHttpApiData BCP47 where
toUrlPiece = toText
Expand Down
2 changes: 1 addition & 1 deletion bcp47-orphans/library/Data/BCP47/PathPieces.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Data.BCP47.PathPieces () where

import Control.Error.Util (hush)
import Data.BCP47 (BCP47, fromText, toText)
import Web.PathPieces (PathPiece(..))
import Web.PathPieces (PathPiece (..))

instance PathPiece BCP47 where
fromPathPiece = hush . fromText
Expand Down
8 changes: 4 additions & 4 deletions bcp47-orphans/library/Data/BCP47/Persist.hs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{-# OPTIONS_GHC -fno-warn-orphans #-}
{-# LANGUAGE TypeApplications #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}

module Data.BCP47.Persist () where

import Control.Monad ((<=<))
import Data.BCP47 (BCP47, fromText, toText)
import Data.Proxy (Proxy(..))
import Data.Proxy (Proxy (..))
import Data.Text (Text)
import Database.Persist.Class (PersistField(..))
import Database.Persist.Sql (PersistFieldSql(..))
import Database.Persist.Class (PersistField (..))
import Database.Persist.Sql (PersistFieldSql (..))

instance PersistField BCP47 where
toPersistValue = toPersistValue . toText
Expand Down
Loading
Loading