Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit c80f11a

Browse files
authored
Merge pull request #22 from haskell-CI/master
Fix macos ghcup and cabal flags (#4)
2 parents c1b48c3 + cfefe70 commit c80f11a

File tree

7 files changed

+7785
-7122
lines changed

7 files changed

+7785
-7122
lines changed

.eslintrc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"root": true,
33
"plugins": ["jest", "@typescript-eslint"],
4-
"extends": ["plugin:github/es6"],
4+
"extends": ["plugin:github/typescript"],
55
"parser": "@typescript-eslint/parser",
66
"parserOptions": {
77
"ecmaVersion": 2019,
@@ -20,7 +20,6 @@
2020
"@typescript-eslint/no-require-imports": "error",
2121
"@typescript-eslint/array-type": "warn",
2222
"@typescript-eslint/await-thenable": "error",
23-
"@typescript-eslint/ban-ts-ignore": "error",
2423
"camelcase": "off",
2524
"@typescript-eslint/explicit-function-return-type": [
2625
"warn",

.github/workflows/workflow.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,15 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
os: [ubuntu-latest, macOS-latest, windows-latest]
38-
ghc: ['8.8', '8.4.4']
39-
cabal: ['3.0.0.0']
38+
ghc: ['latest', '8.4.4']
39+
cabal: ['latest']
4040
include:
4141
- os: ubuntu-latest
4242
ghc: '7.10.3'
4343
cabal: '3.0.0.0'
44+
- os: ubuntu-latest
45+
ghc: '8.2.2'
46+
cabal: '2.0'
4447

4548
steps:
4649
- uses: actions/checkout@v2
@@ -56,6 +59,11 @@ jobs:
5659
- run: |
5760
cabal --version
5861
ghc --version
62+
- shell: bash
63+
if: matrix.ghc != 'latest'
64+
# this check depends on the ghc versions being "exact" in the matrix
65+
run: |
66+
[[ $(ghc --numeric-version) == ${{ matrix.ghc }} ]]
5967
6068
install-stack:
6169
name: Stack ${{ matrix.stack }} ${{ matrix.os }}

0 commit comments

Comments
 (0)