From a3aef79326f51bcf8131e5fd81cf3d3f72751800 Mon Sep 17 00:00:00 2001 From: TiredPixelBot Date: Tue, 29 Mar 2022 00:57:23 +0000 Subject: [PATCH 1/5] [auto] upgrade --- pkg/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/Dockerfile b/pkg/Dockerfile index c6b2bc0..ff8817c 100644 --- a/pkg/Dockerfile +++ b/pkg/Dockerfile @@ -1,5 +1,5 @@ # FROMFREEZE docker.io/library/debian:10 -FROM docker.io/library/debian@sha256:d97fcaf659ba307d72b8d0fea5d0bae435247490046e7c0eca17c52fc66a53ca +FROM docker.io/library/debian@sha256:b0ea1bd60529c809e6744e244e50203c1d93511a1be8c02c41cb2c13334190c3 ARG USER=x ARG HOME=/home/x From 3d7322ae477651eb601acd32ea1c195821598d28 Mon Sep 17 00:00:00 2001 From: TiredPixelBot Date: Tue, 29 Mar 2022 08:42:11 +0000 Subject: [PATCH 2/5] [auto] upgrade --- pkg/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/Dockerfile b/pkg/Dockerfile index ff8817c..e82090d 100644 --- a/pkg/Dockerfile +++ b/pkg/Dockerfile @@ -1,5 +1,5 @@ # FROMFREEZE docker.io/library/debian:10 -FROM docker.io/library/debian@sha256:b0ea1bd60529c809e6744e244e50203c1d93511a1be8c02c41cb2c13334190c3 +FROM docker.io/library/debian@sha256:fe75c6ff06eb65916c00a47fabcfaed28c049b37a9cc466eda54b5927888e544 ARG USER=x ARG HOME=/home/x From d55585c8440cdc286e07de2073dc34b7946d0fe1 Mon Sep 17 00:00:00 2001 From: TiredPixelBot Date: Wed, 30 Mar 2022 08:33:04 +0000 Subject: [PATCH 3/5] [auto] upgrade --- Dockerfile | 2 +- pkg/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fe6cc01..5a04cd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # FROMFREEZE docker.io/library/haskell:8.10 -FROM docker.io/library/haskell@sha256:5df319ffea19aa4a39db9047f173c5318952995b84092bf14fa014b43df44c46 +FROM docker.io/library/haskell@sha256:72c3d68618aeacc0df381b1ad650221c9e599bcbe017f33030a15c4b28c4f919 ARG USER=x ARG HOME=/home/x diff --git a/pkg/Dockerfile b/pkg/Dockerfile index e82090d..0d8ab93 100644 --- a/pkg/Dockerfile +++ b/pkg/Dockerfile @@ -1,5 +1,5 @@ # FROMFREEZE docker.io/library/debian:10 -FROM docker.io/library/debian@sha256:fe75c6ff06eb65916c00a47fabcfaed28c049b37a9cc466eda54b5927888e544 +FROM docker.io/library/debian@sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a ARG USER=x ARG HOME=/home/x From 8f86d8cd4df87a7ab4b1e4c8e0b034377085cf86 Mon Sep 17 00:00:00 2001 From: TiredPixelBot Date: Wed, 30 Mar 2022 11:16:07 +0000 Subject: [PATCH 4/5] [auto] upgrade --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5a04cd9..26397a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # FROMFREEZE docker.io/library/haskell:8.10 -FROM docker.io/library/haskell@sha256:72c3d68618aeacc0df381b1ad650221c9e599bcbe017f33030a15c4b28c4f919 +FROM docker.io/library/haskell@sha256:bc7488627b02c0593c561e37473b5e969ffd652ff52974dbf1183f665920b69a ARG USER=x ARG HOME=/home/x From 6e4beba3219180717ea51f3179a9fc05380de555 Mon Sep 17 00:00:00 2001 From: Nic Williams Date: Fri, 1 Apr 2022 08:40:58 +0000 Subject: [PATCH 5/5] build: add bin/test --- .hlint.yaml | 66 -------------------------------------- bin/test | 10 ++++++ docker-compose.yml.example | 3 +- 3 files changed, 12 insertions(+), 67 deletions(-) delete mode 100644 .hlint.yaml create mode 100755 bin/test diff --git a/.hlint.yaml b/.hlint.yaml deleted file mode 100644 index 2accfa8..0000000 --- a/.hlint.yaml +++ /dev/null @@ -1,66 +0,0 @@ -# HLint configuration file -# https://github.com/ndmitchell/hlint -########################## - -# This file contains a template configuration file, which is typically -# placed as .hlint.yaml in the root of your project - - -# Specify additional command line arguments -# -# - arguments: [--color, --cpp-simple, -XQuasiQuotes] - - -# Control which extensions/flags/modules/functions can be used -# -# - extensions: -# - default: false # all extension are banned by default -# - name: [PatternGuards, ViewPatterns] # only these listed extensions can be used -# - {name: CPP, within: CrossPlatform} # CPP can only be used in a given module -# -# - flags: -# - {name: -w, within: []} # -w is allowed nowhere -# -# - modules: -# - {name: [Data.Set, Data.HashSet], as: Set} # if you import Data.Set qualified, it must be as 'Set' -# - {name: Control.Arrow, within: []} # Certain modules are banned entirely -# -# - functions: -# - {name: unsafePerformIO, within: []} # unsafePerformIO can only appear in no modules - - -# Add custom hints for this project -# -# Will suggest replacing "wibbleMany [myvar]" with "wibbleOne myvar" -# - error: {lhs: "wibbleMany [x]", rhs: wibbleOne x} - -# The hints are named by the string they display in warning messages. -# For example, if you see a warning starting like -# -# Main.hs:116:51: Warning: Redundant == -# -# You can refer to that hint with `{name: Redundant ==}` (see below). - -# Turn on hints that are off by default -# -# Ban "module X(module X) where", to require a real export list -# - warn: {name: Use explicit module export list} -# -# Replace a $ b $ c with a . b $ c -# - group: {name: dollar, enabled: true} -# -# Generalise map to fmap, ++ to <> -# - group: {name: generalise, enabled: true} - - -# Ignore some builtin hints -# - ignore: {name: Use let} -# - ignore: {name: Use const, within: SpecialModule} # Only within certain modules - - -# Define some custom infix operators -# - fixity: infixr 3 ~^#^~ - - -# To generate a suitable file for HLint do: -# $ hlint --default > .hlint.yaml diff --git a/bin/test b/bin/test new file mode 100755 index 0000000..6608eda --- /dev/null +++ b/bin/test @@ -0,0 +1,10 @@ +#!/bin/bash -eu +set -o pipefail +#------------------------------------------------------------------------------- +cabal run stylish-haskell -- -ir \ + lib/ src/ test/ + +cabal run hlint -- \ + lib/ src/ test/ + +cabal test --test-show-details=direct diff --git a/docker-compose.yml.example b/docker-compose.yml.example index 37cc442..4367c01 100644 --- a/docker-compose.yml.example +++ b/docker-compose.yml.example @@ -1,11 +1,12 @@ +# vim: set ft=yaml: version: "2.4" services: plugin_spellchecker: image: docker.io/tiredpixel/isoxya-plugin-spellchecker.build:unstable init: true volumes: - - ./.hlint.yaml:/home/x/repo/.hlint.yaml - ./.stylish-haskell.yaml:/home/x/repo/.stylish-haskell.yaml + - ./bin:/home/x/repo/bin - ./isoxya-plugin-spellchecker.cabal:/home/x/repo/isoxya-plugin-spellchecker.cabal - ./lib:/home/x/repo/lib - ./src:/home/x/repo/src