Skip to content

Commit

Permalink
Merge pull request #41 from cabalism/add/fix-whitespace
Browse files Browse the repository at this point in the history
Add fix-whitespace configuration and check
  • Loading branch information
philderbeast authored May 20, 2024
2 parents f4af6b2 + b7650cb commit 1ccdf48
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
run: stack test --no-run-tests --no-terminal --stack-yaml=./stack/stack-${{ matrix.ghc }}.yaml

- name: test golden
run: stack test hpack-dhall:golden --no-terminal --test-arguments "--color=always" --stack-yaml=./stack/stack-${{ matrix.ghc }}.yaml
run: stack test hpack-dhall:golden --no-terminal --test-arguments "--color=always" --stack-yaml=./stack/stack-${{ matrix.ghc }}.yaml
13 changes: 13 additions & 0 deletions .github/workflows/whitespace.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: whitespace

on:
push:
pull_request:

jobs:
check:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: andreasabel/fix-whitespace-action@v1
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ it should be possible to get them in sync again.
![cabal](https://github.com/BlockScope/hpack-dhall/workflows/cabal/badge.svg)
![stack](https://github.com/BlockScope/hpack-dhall/workflows/stack/badge.svg)
[![hackage release](https://img.shields.io/hackage/v/hpack-dhall.svg?label=hackage)](http://hackage.haskell.org/package/hpack-dhall)
[![Dependencies of latest version on Hackage](https://img.shields.io/hackage-deps/v/hpack-dhall.svg)](https://hackage.haskell.org/package/hpack-dhall)
[![Dependencies of latest version on Hackage](https://img.shields.io/hackage-deps/v/hpack-dhall.svg)](https://hackage.haskell.org/package/hpack-dhall)
2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ The [latest version](https://github.com/blockscope/hpack-dhall/blob/master/chang
* Use explicit dependencies to achieve consistent golden tests in all but
stack-8.6.3.yaml.

## 0.5.1 - Minor, bump in hpack version
## 0.5.1 - Minor, bump in hpack version
* Regenerate golden files for the bump in hpack's version:

```
Expand Down
4 changes: 2 additions & 2 deletions docs/BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Copied executables to /Users/pdejoux/.local/bin:
- dhall-hpack-cabal
- dhall-hpack-dhall
- dhall-hpack-json
- dhall-hpack-yaml
- dhall-hpack-yaml
# installing with cabal
$ ghcup --version
Expand All @@ -28,4 +28,4 @@ Symlinking 'dhall-hpack-dhall' to '/Users/.../.cabal/bin/dhall-hpack-dhall'
Symlinking 'dhall-hpack-json' to '/Users/.../.cabal/bin/dhall-hpack-json'
Symlinking 'dhall-hpack-yaml' to '/Users/.../.cabal/bin/dhall-hpack-yaml'
Symlinking 'dhall-hpack-cabal' to '/Users/.../.cabal/bin/dhall-hpack-cabal'
```
```
11 changes: 11 additions & 0 deletions fix-whitespace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
excluded-dirs:
- "dist-newstyle"

included-files:
- "**/*.cabal"
- "**/*.dhall"
- "**/*.hs"
- "**/*.md"
- "**/*.project"
- "**/*.yaml"
- "**/*.yml"
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ packages:
extra-deps:
- dhall-1.41.1@sha256:4aba33b3a390fe05891285568d53c10ead112695ef217cc512616a0d7bd00483,15475
- dhall-json-1.7.10@sha256:9d3ef002add9a4e6d54af3b1506d09ff959e7f1a7333378e7884ac1b87ea136c,4362
- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
2 changes: 1 addition & 1 deletion stack/stack-9.0.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ packages:
extra-deps:
- dhall-1.41.1@sha256:4aba33b3a390fe05891285568d53c10ead112695ef217cc512616a0d7bd00483,15475
- dhall-json-1.7.10@sha256:9d3ef002add9a4e6d54af3b1506d09ff959e7f1a7333378e7884ac1b87ea136c,4362
- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
2 changes: 1 addition & 1 deletion stack/stack-9.2.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ resolver: nightly-2022-04-27
packages:
- '../'
extra-deps:
- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726

0 comments on commit 1ccdf48

Please sign in to comment.