Merge pull request #5 from codewars/use-stack

kazk · web-flow · commit e1737a4ef18e · 2023-02-09T15:15:58.000-08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Workaround runner image issue
+      # https://github.com/actions/runner-images/issues/7061
+      run: sudo chown -R $USER /usr/local/.ghcup
+
+    - uses: haskell/actions/setup@v2
+      with:
+        enable-stack: true
+
+    - run: stack build
+    - run: stack test
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,5 @@ cabal.project.local
 cabal.project.local~
 .HTF/
 .ghc.environment.*
+.stack-work/
+*~
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -27,6 +27,6 @@ main = hspecWith defaultConfig {configFormatter = Just codewars} Spec.spec
 ## Development
 
 ```shell
-cabal install
-cabal test
+stack build
+stack test
 ```
diff --git a/cabal.project.freeze b/cabal.project.freeze
diff --git a/hspec-formatters-codewars.cabal b/hspec-formatters-codewars.cabal
@@ -1,36 +1,54 @@
-cabal-version: 2.4
-name:          hspec-formatters-codewars
-version:       0.2.0
-synopsis:      Hspec formatter for Codewars
-homepage:      https://github.com/codewars/hspec-formatters-codewars
-license:       MIT
-build-type:    Simple
+cabal-version: 1.12
 
-library
-  hs-source-dirs:   src
-  build-depends:
-    , base        >=4   && <5
-    , hspec       >=2.8 && <3
-    , hspec-core  >=2.8 && <3
-    , text        >=2   && <3
+-- This file has been generated from package.yaml by hpack version 0.35.0.
+--
+-- see: https://github.com/sol/hpack
 
-  exposed-modules:  Test.Hspec.Formatters.Codewars
-  default-language: GHC2021
+name:           hspec-formatters-codewars
+version:        0.2.0
+synopsis:       Hspec formatter for Codewars
+description:    Please see the README on GitHub at <https://github.com/codewars/hspec-formatters-codewars#readme>
+homepage:       https://github.com/codewars/hspec-formatters-codewars#readme
+bug-reports:    https://github.com/codewars/hspec-formatters-codewars/issues
+license:        MIT
+license-file:   LICENSE
+build-type:     Simple
+extra-source-files:
+    README.md
 
-test-suite hspec-formatters-codewars-spec
-  type:               exitcode-stdio-1.0
-  default-language:   GHC2021
-  main-is:            Main.hs
-  hs-source-dirs:     test src
-  build-depends:
-    , base        >=4   && <5
-    , hspec       >=2.8 && <3
-    , hspec-core  >=2.8 && <3
-    , text        >=2   && <3
+source-repository head
+  type: git
+  location: https://github.com/codewars/hspec-formatters-codewars
 
+library
+  exposed-modules:
+      Test.Hspec.Formatters.Codewars
   other-modules:
-    Spec
-    Spec.ExampleSpec
-    Test.Hspec.Formatters.Codewars
+      Paths_hspec_formatters_codewars
+  hs-source-dirs:
+      src
+  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
+  build-depends:
+      base >=4.7 && <5
+    , hspec-core >=2.8
+    , text
+  default-language: Haskell2010
 
-  build-tool-depends: hspec-discover:hspec-discover >=2 && <3
+test-suite hspec-formatters-codewars-test
+  type: exitcode-stdio-1.0
+  main-is: Main.hs
+  other-modules:
+      ExampleSpec
+      Spec
+      Paths_hspec_formatters_codewars
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      base >=4.7 && <5
+    , hspec >=2.8
+    , hspec-core >=2.8
+    , hspec-formatters-codewars
+    , text
+  default-language: Haskell2010
+  build-tool-depends: hspec-discover:hspec-discover
diff --git a/package.yaml b/package.yaml
@@ -0,0 +1,53 @@
+name:     hspec-formatters-codewars
+version:  0.2.0
+github:   "codewars/hspec-formatters-codewars"
+license:  MIT
+synopsis: Hspec formatter for Codewars
+
+extra-source-files:
+- README.md
+
+# Metadata used when publishing your package
+# synopsis:            Short description of your package
+# category:            Web
+
+# To avoid duplicated efforts in documentation and dealing with the
+# complications of embedding Haddock markup inside cabal files, it is
+# common to point users to the README.md file.
+description: Please see the README on GitHub at <https://github.com/codewars/hspec-formatters-codewars#readme>
+
+dependencies:
+- base >= 4.7 && < 5
+- hspec-core >= 2.8
+- text
+
+ghc-options:
+- -Wall
+- -Wcompat
+- -Widentities
+- -Wincomplete-record-updates
+- -Wincomplete-uni-patterns
+- -Wmissing-export-lists
+- -Wmissing-home-modules
+- -Wpartial-fields
+- -Wredundant-constraints
+
+library:
+  source-dirs: src
+
+tests:
+  hspec-formatters-codewars-test:
+    main:                Main.hs
+    source-dirs:         test
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies:
+    - base >= 4.7 && < 5
+    - hspec >= 2.8
+    - hspec-core >= 2.8
+    - hspec-formatters-codewars
+    verbatim:
+      build-tool-depends:
+        hspec-discover:hspec-discover
diff --git a/stack.yaml b/stack.yaml
@@ -0,0 +1,66 @@
+# This file was automatically generated by 'stack init'
+#
+# Some commonly used options have been documented as comments in this file.
+# For advanced use and comprehensive documentation of the format, please see:
+# https://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# Resolver to choose a 'specific' stackage snapshot or a compiler version.
+# A snapshot resolver dictates the compiler version and the set of packages
+# to be used for project dependencies. For example:
+#
+# resolver: lts-3.5
+# resolver: nightly-2015-09-21
+# resolver: ghc-7.10.2
+#
+# The location of a snapshot can be provided as a file or url. Stack assumes
+# a snapshot provided as a file might change, whereas a url resource does not.
+#
+# resolver: ./custom-snapshot.yaml
+# resolver: https://example.com/snapshots/2018-01-01.yaml
+resolver: lts-20.10
+
+# User packages to be built.
+# Various formats can be used as shown in the example below.
+#
+# packages:
+# - some-directory
+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
+#   subdirs:
+#   - auto-update
+#   - wai
+packages:
+- .
+# Dependency packages to be pulled from upstream that are not in the resolver.
+# These entries can reference officially published versions as well as
+# forks / in-progress versions pinned to a git hash. For example:
+#
+# extra-deps:
+# - acme-missiles-0.3
+# - git: https://github.com/commercialhaskell/stack.git
+#   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+#
+# extra-deps: []
+
+# Override default flag values for local packages and extra-deps
+# flags: {}
+
+# Extra package databases containing global packages
+# extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+#
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: ">=2.7"
+#
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+#
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
+#
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor
diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -0,0 +1,12 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages: []
+snapshots:
+- completed:
+    sha256: 17870c63f8041ac17a38096124abeb953cb14d84bfc96deb88f9b24daa97b347
+    size: 649332
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/10.yaml
+  original: lts-20.10
diff --git a/test/ExampleSpec.hs b/test/ExampleSpec.hs
@@ -1,4 +1,4 @@
-module Spec.ExampleSpec where
+module ExampleSpec where
 
 import Test.Hspec
 
diff --git a/test/Main.hs b/test/Main.hs
@@ -1,4 +1,4 @@
-module Main where
+module Main (main) where
 
 import Test.Hspec.Runner
 import Test.Hspec.Formatters.Codewars (codewars)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Spec.ExampleSpec where`
	`1`	`+module ExampleSpec where`
`2`	`2`
`3`	`3`	`import Test.Hspec`
`4`	`4`