Skip to content

Commit ac8e65f

Browse files
committed
Merge branch 'CI'
2 parents e60969e + 440f5f0 commit ac8e65f

File tree

6 files changed

+76
-20
lines changed

6 files changed

+76
-20
lines changed

.github/workflows/test.yaml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: Haskell CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build-cabal:
11+
12+
runs-on: ${{ matrix.os }}
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
os: [ubuntu-latest, macOS-latest, windows-latest]
17+
ghc: ['8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.1', '9.2.1']
18+
cabal: ['3.6.2.0']
19+
20+
steps:
21+
- uses: actions/checkout@v2
22+
23+
- if: matrix.os == 'windows-latest'
24+
name: Install ghcup on windows
25+
run: Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing))) -ArgumentList $false,$true,$true,$false,$false,$false,$false,"C:\","", "C:\msys64"
26+
27+
- if: matrix.os == 'windows-latest'
28+
name: Add ghcup to PATH
29+
run: echo "/c/ghcup/bin" >> $GITHUB_PATH
30+
shell: bash
31+
32+
- if: matrix.os != 'windows-latest'
33+
name: Install ghcup on non-windows
34+
run: curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 sh
35+
36+
- name: Install ghc/cabal
37+
run: |
38+
ghcup install ghc ${{ matrix.ghc }}
39+
ghcup install cabal ${{ matrix.cabal }}
40+
shell: bash
41+
42+
- name: Update cabal index
43+
run: cabal update
44+
shell: bash
45+
46+
- name: Build
47+
run: cabal build --enable-tests --enable-benchmarks
48+
shell: bash
49+
50+
- name: Run tests
51+
run: cabal test
52+
shell: bash
53+
54+
- name: Haddock
55+
run: cabal haddock
56+
shell: bash
57+
58+
- name: Generate.hs
59+
run: |
60+
runhaskell Generate.hs
61+
git diff --exit-code
62+
shell: bash
63+
64+
- name: check
65+
run: cabal check
66+
shell: bash
67+
68+
- name: sdist
69+
run: cabal sdist
70+
shell: bash

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
GNUmakefile
22
dist-install/
3+
dist-newstyle/
34
dist/
45
ghc.mk
56
.stack-work/

.travis.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

filepath.cabal

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
cabal-version: >= 1.18
1+
cabal-version: 1.18
22
name: filepath
33
version: 1.4.2.1
44
-- NOTE: Don't forget to update ./changelog.md
55
license: BSD3
66
license-file: LICENSE
77
author: Neil Mitchell <[email protected]>
8-
maintainer: Neil Mitchell <[email protected]>
8+
maintainer: Julian Ospald <[email protected]>
99
copyright: Neil Mitchell 2005-2020
1010
bug-reports: https://github.com/haskell/filepath/issues
1111
homepage: https://github.com/haskell/filepath#readme
1212
category: System
1313
build-type: Simple
1414
synopsis: Library for manipulating FilePaths in a cross platform way.
15-
tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2
15+
tested-with: GHC==9.2.1, GHC==9.0.1, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2
1616
description:
1717
This package provides functionality for manipulating @FilePath@ values, and is shipped with both <https://www.haskell.org/ghc/ GHC> and the <https://www.haskell.org/platform/ Haskell Platform>. It provides three modules:
1818
.
@@ -56,12 +56,11 @@ test-suite filepath-tests
5656
type: exitcode-stdio-1.0
5757
default-language: Haskell2010
5858
main-is: Test.hs
59-
ghc-options: -main-is Test
6059
hs-source-dirs: tests
6160
other-modules:
6261
TestGen
6362
TestUtil
6463
build-depends:
6564
filepath,
6665
base,
67-
QuickCheck >= 2.7 && < 2.14
66+
QuickCheck >= 2.7 && < 2.15

tests/Test.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
module Test(main) where
2+
module Main where
33

44
import System.Environment
55
import TestGen

travis.hs

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)