From 793880269cb9509ebf9f4a4a6628df2af23df98f Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 7 Feb 2021 14:01:04 -0500 Subject: [PATCH] Switch to GitHub Actions --- .devcontainer/Dockerfile | 4 ---- .devcontainer/devcontainer.json | 13 ------------- .github/workflows/ci.yaml | 18 +++++++++--------- LICENSE.txt | 2 +- README.markdown | 2 +- cabal.project | 3 --- src/test/Main.hs | 1 + stack.yaml | 2 +- witch.cabal | 10 +++++----- 9 files changed, 18 insertions(+), 37 deletions(-) delete mode 100644 .devcontainer/Dockerfile delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 cabal.project diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index 68f1996..0000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM haskell:8.10.2 -ARG LOGIN=haskell -RUN useradd --create-home --shell "$( which bash )" "$LOGIN" -USER $LOGIN diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index b673142..0000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "build": { - "dockerfile": "Dockerfile" - }, - "containerUser": "haskell", - "extensions": [ - "taylorfausak.purple-yolk" - ], - "postCreateCommand": "cabal update", - "settings": { - "purple-yolk.ghci.command": "cabal repl" - } -} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 92b796c..51a76e8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,10 +2,10 @@ name: CI on: pull_request: branches: - - master + - main push: branches: - - master + - main release: types: - created @@ -13,17 +13,17 @@ jobs: build: strategy: matrix: - os: [ macos-10.15, ubuntu-18.04, windows-2019 ] - ghc: [ 8.10.2 ] - cabal: [ 3.2.0.0 ] include: - - { os: ubuntu-18.04, ghc: 8.8.4, cabal: 3.2.0.0 } - - { os: ubuntu-18.04, ghc: 8.6.5, cabal: 3.2.0.0 } + - { os: ubuntu-18.04, ghc: 9.0.1, cabal: 3.4.0.0 } + - { os: ubuntu-18.04, ghc: 8.10.3, cabal: 3.2.0.0 } + - { os: macos-10.15, ghc: 8.10.3, cabal: 3.2.0.0 } + - { os: windows-2019, ghc: 8.10.3, cabal: 3.2.0.0 } + - { os: ubuntu-18.04, ghc: 8.8.4, cabal: 3.0.0.0 } runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 - id: setup-haskell - uses: actions/setup-haskell@v1 + uses: haskell/actions/setup@v1 with: ghc-version: ${{ matrix.ghc }} cabal-version: ${{ matrix.cabal }} @@ -42,5 +42,5 @@ jobs: path: dist-newstyle/sdist/witch-*.tar.gz name: witch-${{ github.sha }}.tar.gz - run: cabal check - - if: github.event_name == 'release' && matrix.os == 'ubuntu-18.04' && matrix.ghc == '8.10.2' + - if: github.event_name == 'release' && matrix.os == 'ubuntu-18.04' && matrix.ghc == '9.0.1' run: cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' dist-newstyle/sdist/witch-*.tar.gz diff --git a/LICENSE.txt b/LICENSE.txt index 232b3a6..f32ab92 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright 2020 Taylor Fausak +Copyright 2021 Taylor Fausak Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/README.markdown b/README.markdown index 9c4c27e..e4435c2 100644 --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,6 @@ # Witch -[![CI](https://github.com/tfausak/witch/workflows/CI/badge.svg)](https://github.com/tfausak/witch/actions) +[![CI](https://github.com/tfausak/witch/workflows/CI/badge.svg)](https://github.com/tfausak/witch/actions/new) [![Hackage](https://img.shields.io/hackage/v/witch)](https://hackage.haskell.org/package/witch) [![Stackage](https://www.stackage.org/package/witch/badge/nightly?label=stackage)](https://www.stackage.org/package/witch) diff --git a/cabal.project b/cabal.project deleted file mode 100644 index 8428240..0000000 --- a/cabal.project +++ /dev/null @@ -1,3 +0,0 @@ -packages: . -package witch - tests: true diff --git a/src/test/Main.hs b/src/test/Main.hs index cb2273c..87b4109 100644 --- a/src/test/Main.hs +++ b/src/test/Main.hs @@ -1,3 +1,4 @@ +{-# options_ghc -Wno-orphans #-} {-# language TypeApplications #-} import qualified Data.ByteString as B diff --git a/stack.yaml b/stack.yaml index 69bc676..ab7f113 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -resolver: nightly-2020-11-11 +resolver: lts-17.0 diff --git a/witch.cabal b/witch.cabal index 94be8b6..ef65390 100644 --- a/witch.cabal +++ b/witch.cabal @@ -17,10 +17,10 @@ source-repository head library build-depends: - base >= 4.12.0 && < 4.15 - , bytestring >= 0.10.8 && < 0.12 - , containers >= 0.6.0 && < 0.7 - , text >= 1.2.3 && < 1.3 + base >= 4.13.0 && < 4.16 + , bytestring >= 0.10.10 && < 0.11 + , containers >= 0.6.2 && < 0.7 + , text >= 1.2.4 && < 1.3 default-language: Haskell2010 exposed-modules: Witch ghc-options: @@ -41,7 +41,7 @@ test-suite test base , bytestring , containers - , hspec >= 2.7.1 && < 2.8 + , hspec >= 2.7.6 && < 2.8 , QuickCheck >= 2.13.2 && < 2.15 , text , witch