Switch to GitHub Actions

tfausak · Feb 7, 2021 · 7938802 · 7938802
1 parent 606a544
commit 7938802
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 37 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -2,28 +2,28 @@ name: CI
 on:
   pull_request:
     branches:
-      - master
+      - main
   push:
     branches:
-      - master
+      - main
   release:
     types:
       - created
 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
@@ -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
@@ -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
diff --git 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
@@ -1 +1 @@
-resolver: nightly-2020-11-11
+resolver: lts-17.0
diff --git 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