Skip to content
This repository has been archived by the owner on Dec 12, 2020. It is now read-only.

Commit

Permalink
Merge pull request #22 from haskell-CI/master
Browse files Browse the repository at this point in the history
Fix macos ghcup and cabal flags (#4)
  • Loading branch information
tclem authored Jun 11, 2020
2 parents c1b48c3 + cfefe70 commit c80f11a
Show file tree
Hide file tree
Showing 7 changed files with 7,785 additions and 7,122 deletions.
3 changes: 1 addition & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"root": true,
"plugins": ["jest", "@typescript-eslint"],
"extends": ["plugin:github/es6"],
"extends": ["plugin:github/typescript"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 2019,
Expand All @@ -20,7 +20,6 @@
"@typescript-eslint/no-require-imports": "error",
"@typescript-eslint/array-type": "warn",
"@typescript-eslint/await-thenable": "error",
"@typescript-eslint/ban-ts-ignore": "error",
"camelcase": "off",
"@typescript-eslint/explicit-function-return-type": [
"warn",
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
ghc: ['8.8', '8.4.4']
cabal: ['3.0.0.0']
ghc: ['latest', '8.4.4']
cabal: ['latest']
include:
- os: ubuntu-latest
ghc: '7.10.3'
cabal: '3.0.0.0'
- os: ubuntu-latest
ghc: '8.2.2'
cabal: '2.0'

steps:
- uses: actions/checkout@v2
Expand All @@ -56,6 +59,11 @@ jobs:
- run: |
cabal --version
ghc --version
- shell: bash
if: matrix.ghc != 'latest'
# this check depends on the ghc versions being "exact" in the matrix
run: |
[[ $(ghc --numeric-version) == ${{ matrix.ghc }} ]]
install-stack:
name: Stack ${{ matrix.stack }} ${{ matrix.os }}
Expand Down
Loading

0 comments on commit c80f11a

Please sign in to comment.