mirror of
https://github.com/kowainik/relude.git
synced 2024-09-11 04:35:39 +03:00
* [#342] Use GHC-8.10.3 with Stack Resolves #342 * Remove appveyor. Check Windows on GH Actions
This commit is contained in:
parent
61371d89a5
commit
e44781bb43
29
.github/workflows/ci.yml
vendored
29
.github/workflows/ci.yml
vendored
@ -12,18 +12,18 @@ jobs:
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest, macOS-latest]
|
||||
cabal: ["3.0"]
|
||||
os: [ubuntu-latest, macOS-latest, windows-latest]
|
||||
cabal: ["3.2"]
|
||||
ghc:
|
||||
- "8.0.2"
|
||||
- "8.2.2"
|
||||
- "8.4.4"
|
||||
- "8.6.5"
|
||||
- "8.8.3"
|
||||
- "8.10.1"
|
||||
- "8.8.4"
|
||||
- "8.10.3"
|
||||
exclude:
|
||||
- os: macOS-latest
|
||||
ghc: 8.8.3
|
||||
ghc: 8.8.4
|
||||
- os: macOS-latest
|
||||
ghc: 8.6.5
|
||||
- os: macOS-latest
|
||||
@ -33,11 +33,22 @@ jobs:
|
||||
- os: macOS-latest
|
||||
ghc: 8.0.2
|
||||
|
||||
- os: windows-latest
|
||||
ghc: 8.8.4
|
||||
- os: windows-latest
|
||||
ghc: 8.6.5
|
||||
- os: windows-latest
|
||||
ghc: 8.4.4
|
||||
- os: windows-latest
|
||||
ghc: 8.2.2
|
||||
- os: windows-latest
|
||||
ghc: 8.0.2
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'
|
||||
|
||||
- uses: actions/setup-haskell@v1.1
|
||||
- uses: haskell/actions/setup@v1
|
||||
id: setup-haskell-cabal
|
||||
name: Setup Haskell
|
||||
with:
|
||||
@ -68,14 +79,14 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
stack: ["2.1.3"]
|
||||
ghc: ["8.8.3"]
|
||||
stack: ["2.5"]
|
||||
ghc: ["8.10.3"]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'
|
||||
|
||||
- uses: actions/setup-haskell@v1.1
|
||||
- uses: haskell/actions/setup@v1
|
||||
name: Setup Haskell Stack
|
||||
with:
|
||||
ghc-version: ${{ matrix.ghc }}
|
||||
|
52
.travis.yml
52
.travis.yml
@ -1,52 +0,0 @@
|
||||
sudo: true
|
||||
language: haskell
|
||||
|
||||
git:
|
||||
depth: 5
|
||||
|
||||
cabal: "3.0"
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- "$HOME/.cabal/store"
|
||||
- "$HOME/.stack"
|
||||
- "$TRAVIS_BUILD_DIR/.stack-work"
|
||||
|
||||
matrix:
|
||||
include:
|
||||
|
||||
# Cabal
|
||||
- ghc: 8.0.2
|
||||
- ghc: 8.2.2
|
||||
- ghc: 8.4.4
|
||||
- ghc: 8.6.5
|
||||
- ghc: 8.8.2
|
||||
|
||||
# stack
|
||||
- ghc: 8.8.2
|
||||
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
|
||||
|
||||
install:
|
||||
- |
|
||||
if [ -z "$STACK_YAML" ]; then
|
||||
cabal build --enable-tests --enable-benchmarks --write-ghc-environment-files=always
|
||||
else
|
||||
# install stack
|
||||
curl -sSL https://get.haskellstack.org/ | sh
|
||||
|
||||
# build project with stack
|
||||
stack --version
|
||||
stack build --system-ghc --test --bench --no-run-tests --no-run-benchmarks
|
||||
fi
|
||||
|
||||
script:
|
||||
- |
|
||||
if [ -z "$STACK_YAML" ]; then
|
||||
cabal haddock
|
||||
cabal test all --enable-tests
|
||||
else
|
||||
stack test --system-ghc
|
||||
fi
|
||||
|
||||
notifications:
|
||||
email: false
|
@ -5,6 +5,7 @@ The changelog is available [on GitHub][2].
|
||||
|
||||
## Unreleased: 0.8.0.0
|
||||
|
||||
* Upgrade to GHC-8.10.3, GHC-8.8.4.
|
||||
* Add `infinitely` as more strictly typed `forever`.
|
||||
|
||||
## 0.7.0.0 — May 14, 2020
|
||||
|
@ -3,8 +3,6 @@
|
||||
![Logo](https://user-images.githubusercontent.com/8126674/67678250-9d8eab80-f99f-11e9-96ca-27883ceeefa6.png)
|
||||
|
||||
[![GitHub CI](https://github.com/kowainik/relude/workflows/CI/badge.svg)](https://github.com/kowainik/relude/actions)
|
||||
[![Travis](https://img.shields.io/travis/kowainik/relude.svg?logo=travis)](http://travis-ci.org/kowainik/relude)
|
||||
[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/kowainik/relude?branch=main&svg=true)](https://ci.appveyor.com/project/kowainik/relude)
|
||||
[![Hackage](https://img.shields.io/hackage/v/relude.svg?logo=haskell)](https://hackage.haskell.org/package/relude)
|
||||
[![Stackage LTS](http://stackage.org/package/relude/badge/lts)](http://stackage.org/lts/package/relude)
|
||||
[![Stackage Nightly](http://stackage.org/package/relude/badge/nightly)](http://stackage.org/nightly/package/relude)
|
||||
|
35
appveyor.yml
35
appveyor.yml
@ -1,35 +0,0 @@
|
||||
clone_folder: "c:\\WORK"
|
||||
clone_depth: 5
|
||||
|
||||
# Do not build feature branch with open Pull Requests
|
||||
skip_branch_with_pr: true
|
||||
|
||||
platform:
|
||||
- x86_64
|
||||
|
||||
cache:
|
||||
- "C:\\SR"
|
||||
- dist-newstyle
|
||||
|
||||
environment:
|
||||
global:
|
||||
CABOPTS: --store-dir=C:\\SR
|
||||
|
||||
matrix:
|
||||
- GHCVER: 8.10.1
|
||||
|
||||
install:
|
||||
- choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
|
||||
- choco install -y cabal --version 3.2.0.0
|
||||
- choco install -y ghc --version %GHCVER%
|
||||
- refreshenv
|
||||
|
||||
before_build:
|
||||
- cabal --version
|
||||
- ghc --version
|
||||
- cabal %CABOPTS% update
|
||||
|
||||
build_script:
|
||||
- cabal %CABOPTS% build --enable-tests --enable-benchmarks --write-ghc-environment-files=always
|
||||
- cabal %CABOPTS% test --enable-tests --test-show-details=direct
|
||||
- cabal %CABOPTS% haddock --enable-documentation
|
@ -87,7 +87,7 @@ license: MIT
|
||||
license-file: LICENSE
|
||||
author: Dmitrii Kovanikov, Veronika Romashkina, Stephen Diehl, Serokell
|
||||
maintainer: Kowainik <xrom.xkov@gmail.com>
|
||||
copyright: 2016 Stephen Diehl, 2016-2018 Serokell, 2018-2020 Kowainik
|
||||
copyright: 2016 Stephen Diehl, 2016-2018 Serokell, 2018-2021 Kowainik
|
||||
category: Prelude
|
||||
stability: stable
|
||||
build-type: Simple
|
||||
@ -97,8 +97,8 @@ tested-with: GHC == 8.0.2
|
||||
GHC == 8.2.2
|
||||
GHC == 8.4.4
|
||||
GHC == 8.6.5
|
||||
GHC == 8.8.3
|
||||
GHC == 8.10.1
|
||||
GHC == 8.8.4
|
||||
GHC == 8.10.3
|
||||
|
||||
|
||||
source-repository head
|
||||
|
@ -1 +1 @@
|
||||
resolver: lts-15.1
|
||||
resolver: lts-17.0
|
||||
|
Loading…
Reference in New Issue
Block a user