Skip to content

Commit

Permalink
Merge pull request #2 from fujimura/use-cabal-3
Browse files Browse the repository at this point in the history
Use cabal 3
  • Loading branch information
fujimura authored Jan 12, 2023
2 parents 6ef666f + cb6d265 commit d5627b0
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 94 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
on: [push]
name: test
jobs:
test:
name: Run test on GHC ${{ matrix.ghc }}
runs-on: ubuntu-latest
strategy:
matrix:
ghc: ['latest']
cabal: ['latest']
steps:
- uses: actions/checkout@v2
- name: Setup Haskell
uses: haskell/actions/setup@v1
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}
- run: cabal test --test-show-details=direct
build:
name: Build on GHC ${{ matrix.ghc }}
runs-on: ubuntu-latest
strategy:
matrix:
ghc: ['latest']
cabal: ['latest']
steps:
- uses: actions/checkout@v2
- name: Setup Haskell
uses: haskell/actions/setup@v1
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}
- run: cabal build
9 changes: 2 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
dist
cabal-dev
*.o
*.hi
*.chi
*.chs.h
.virthualenv
.hsenv
.cabal-sandbox/
cabal.sandbox.config
.stack-work/
dist-newstyle
hie.yaml
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# git-freq [![Circle CI](https://circleci.com/gh/fujimura/git-freq.svg?style=shield)](https://circleci.com/gh/fujimura/git-freq)[![Coverage Status](https://img.shields.io/coveralls/fujimura/git-freq.svg)](https://coveralls.io/r/fujimura/git-freq?branch=master)
# git-freq ![ci](https://github.com/fujimura/git-freq/actions/workflows/ci.yaml/badge.svg)

A Git subcommand to show total addition, deletion per file

Expand Down Expand Up @@ -38,7 +38,7 @@ src/Control/Lens/Plated.hs,2395,1715
## How to run tests

```
$ stack test
$ cabal test
```

## Contributing
Expand Down
14 changes: 0 additions & 14 deletions circle.yml

This file was deleted.

85 changes: 43 additions & 42 deletions git-freq.cabal
Original file line number Diff line number Diff line change
@@ -1,48 +1,49 @@
name: git-freq
version: 0.0.3
cabal-version: >=1.10
build-type: Simple
license: BSD3
license-file: LICENSE
maintainer: Fujimura Daisuke<[email protected]>
homepage: https://github.com/fujimura/git-freq
synopsis: A Git subcommand to show total addition, deletion per file
description:
A Git subcommand to show total addition, deletion per file
author: Fujimura Daisuke<[email protected]>
cabal-version: 2.2
name: git-freq
version: 0.0.3
build-type: Simple
license: BSD-3-Clause
license-file: LICENSE
maintainer: Fujimura Daisuke<[email protected]>
homepage: https://github.com/fujimura/git-freq
synopsis: A Git subcommand to show total addition, deletion per file
description: A Git subcommand to show total addition, deletion per file
author: Fujimura Daisuke<[email protected]>

source-repository head
type: git
location: [email protected]:fujimura/git-freq.git
type: git
location: [email protected]:fujimura/git-freq.git

common default
default-language: Haskell2010
ghc-options: -Wall -fno-warn-name-shadowing

common dependencies
build-depends:
, base >=4 && <5
, bytestring
, containers
, io-streams
, optparse-applicative
, process
, text

executable git-freq
main-is: Main.hs
build-depends:
base >=4 && <5,
bytestring -any,
containers -any,
io-streams -any,
optparse-applicative -any,
process -any,
text -any
default-language: Haskell2010
hs-source-dirs: src
other-modules:
Git.Freq
ghc-options: -Wall -fno-warn-name-shadowing
import: dependencies, default
main-is: Main.hs
hs-source-dirs: src
other-modules:
Git.Freq
Paths_git_freq

test-suite spec
type: exitcode-stdio-1.0
main-is: Spec.hs
build-depends:
base -any,
bytestring -any,
containers -any,
io-streams -any,
hspec -any,
optparse-applicative -any,
process -any,
text -any
default-language: Haskell2010
hs-source-dirs: src test
ghc-options: -Wall -fno-warn-name-shadowing
import: dependencies, default
type: exitcode-stdio-1.0
main-is: Spec.hs
build-depends: hspec
build-tool-depends: hspec-discover:hspec-discover -any
hs-source-dirs: src test
other-modules:
Git.Freq
Git.FreqSpec
Paths_git_freq
29 changes: 0 additions & 29 deletions stack.yaml

This file was deleted.

0 comments on commit d5627b0

Please sign in to comment.