Merge pull request #1 from cgohla/noCapitalisms

No capitalisms

Author: bgohla

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches-ignore:
       - 'ghc-next*'
-      - 'ghc-9.10*'
+      - 'ghc-9.12*'
   pull_request:
     branches-ignore:
       - 'ghc-next*'
@@ -12,36 +12,32 @@ on:
 jobs:
   test:
     runs-on: ${{ matrix.os }}
-
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ghc: ['9.8', '9.6', '9.4']
+        ghc: ['9.12', '9.10', '9.8']
         include:
         - os: windows-latest
-          ghc: '9.8'
+          ghc: '9.12'
         - os: macOS-latest
-          ghc: '9.8'
-
+          ghc: '9.12'
     steps:
     - run: git config --global core.autocrlf false
-    - uses: actions/checkout@v2
-    - uses: haskell/actions/setup@v2
+    - uses: actions/checkout@v4
+    - uses: haskell-actions/setup@v2
       id: setup-haskell
       with:
         ghc-version: ${{ matrix.ghc }}
-    - name: Get GHC libdir
-      id: get-ghc-libdir
-      run: |
-        echo "libdir=$(ghc --print-libdir)" >> $GITHUB_OUTPUT
-      shell: bash
+    - run: cabal install apply-refact --install-method=copy
+      # Not available on GHC 9.10, see https://github.com/mpickering/apply-refact/pull/149
+      if: matrix.ghc == '9.12' || matrix.ghc == '9.8'
     - run: cabal v2-freeze --enable-tests
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
-        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ steps.get-ghc-libdir.outputs.libdir }}-${{ hashFiles('cabal.project.freeze') }}
-    - run: cabal new-install apply-refact --install-method=copy
+        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
+        restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
     - uses: ndmitchell/neil@master
       with:
         hlint-arguments: src

.github/workflows/ghc-9.10.yml

@@ -4,41 +4,46 @@ on:
     branches:
       - 'ghc-next*'
   schedule:
-    - cron:  '0 3 * * 5'
+    - cron:  '0 8 * * 6' # once a week. saturdays at 8am
 jobs:
-  ghc-9-10:
+  ghc-next:
     name: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}-latest
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu, macos, windows]
     steps:
+      - uses: actions/checkout@v4
       - uses: haskell-actions/setup@v2
+        id: setup-haskell
         with:
-          ghc-version: '9.8.1'
-          enable-stack: true
-          stack-version: '2.15.7'
-      # - name: Upgrade stack from git
-      #   run: |-
-      #      stack upgrade --git
-      #      echo "$HOME/.local/bin" >> $GITHUB_PATH
-      #      which stack
-      #      stack --version
-      #   shell: bash
-      - name: Install build tools
+          ghc-version: 9.10.1
+          cabal-version: 'latest'
+      - name: Install build tools (macOS)
         run: brew install automake
         if: matrix.os == 'macos'
-      - name: Configure
-        # e.g. Don't recursively delete '.stack-work' (`stack clean --full`)
-        run: echo "GHCLIB_AZURE='1'" >> $GITHUB_ENV
+      - name: Configure msys2 (windows)
         shell: bash
-      - name: Boot
         run: |-
-          cabal update
+          echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
+          echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
+          echo "/c/msys64/usr/bin" >> $GITHUB_PATH
+        if: matrix.os == 'windows'
+      - name: Run hlint-from-scratch (windows)
+        shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
+        run: |-
+          GHCLIB_AZURE=1; export GHCLIB_AZURE
+          pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
           git clone https://github.com/shayne-fletcher/hlint-from-scratch.git
           hlint-from-scratch/hlint-from-scratch.sh --init="$HOME/project"
+          hlint-from-scratch/hlint-from-scratch.sh --ghc-flavor="ghc-master" --no-checkout
+        if: matrix.os == 'windows'
+      - name: Run hlint-from-scratch (unix)
         shell: bash
-      - name: Build and Test ('ghc-next')
-        run: hlint-from-scratch/hlint-from-scratch.sh --ghc-flavor="" --stack-yaml=stack-exact.yaml --resolver=ghc-9.8.1 --no-checkout
-        shell: bash
+        run: |-
+          GHCLIB_AZURE=1; export GHCLIB_AZURE
+          git clone https://github.com/shayne-fletcher/hlint-from-scratch.git
+          hlint-from-scratch/hlint-from-scratch.sh --init="$HOME/project"
+          hlint-from-scratch/hlint-from-scratch.sh --ghc-flavor="ghc-master" --no-checkout
+        if: matrix.os == 'ubuntu' || matrix.os == 'macos'

.github/workflows/ghc-next.yml

@@ -1,31 +1,30 @@
 name: release
 on:
-  # Match when pushing tags v*, i.e. v1.0, v20.15.10
-  push:
-    tags: ['v*']
-
+    workflow_dispatch:
+    release:
+      types: [created]
+  
 jobs:
   init:
     runs-on: ubuntu-latest
     outputs:
-      upload_url: ${{ steps.create-release.outputs.upload_url }}
+      upload_url: ${{ steps.release.outputs.upload_url }}
       filename: hlint-${{ steps.reftags_version.outputs._1 }}
 
     steps:
+    - uses: joutvhu/get-release@v1
+      id: release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        latest: true
+
     - uses: rishabhgupta/split-by@v1
       id: reftags_version
       with:
-        string: ${{ github.ref }} # e.g. refs/tags/v0.11.1.1
+        string: ${{ steps.release.outputs.tag_name }} # e.g. refs/tags/v0.11.1.1
         split-by: 'v'
 
-    - uses: actions/create-release@v1
-      id: create-release
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: v${{ steps.reftags_version.outputs._1 }}
-        release_name: v${{ steps.reftags_version.outputs._1 }}
-
   build:
     needs: init
     runs-on: ${{ matrix.os }}
@@ -37,16 +36,16 @@ jobs:
         - os: ubuntu-20.04
           SUFFIX: x86_64-linux.tar.gz
         - os: macOS-latest
-          SUFFIX: x86_64-osx.tar.gz
+          SUFFIX: arm64-osx.tar.gz
         - os: windows-latest
           SUFFIX: x86_64-windows.zip
 
     steps:
     - run: git config --global core.autocrlf false
-    - uses: actions/checkout@v2
-    - uses: haskell/actions/setup@v2
+    - uses: actions/checkout@v4
+    - uses: haskell-actions/setup@v2
       with:
-        ghc-version: '9.6'
+        ghc-version: '9.12'
     - uses: ndmitchell/neil@master
       with:
         make-release: true

.github/workflows/release.yml

@@ -16,3 +16,4 @@ stack*.yaml.lock
 .\#*\#
 /.sl/
 *.dump-hi
+.DS_Store

.gitignore

@@ -1,5 +1,13 @@
 Changelog for HLint (* = breaking change)
 
+3.10, released 2024-02-02
+    #1617, hints for when x <*> y could be y, e.g. []
+*   #1594, upgrade to GHC 9.12
+    #1568, add mapMaybe f (reverse x) ==> reverse (mapMaybe f x)
+    #1569, avoid redundant Foldable.toList calls in Foldable operations
+    #1571, rename a few hints to make them clearer
+    #1599, add translated 0 0 hint for CodeWorld project
+    #1600, add sum [x, y] ==> x + y
     #1549, downgrade a few of the error severities to warn
 3.8, released 2024-01-15
     #1552, make --git and --ignore-glob work nicely together

CHANGES.txt

@@ -1,4 +1,4 @@
-Copyright Neil Mitchell 2006-2024.
+Copyright Neil Mitchell 2006-2025.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

LICENSE

@@ -184,12 +184,6 @@ If you're using git, it may be helpful to only run hlint on changed files. This
 { git diff --diff-filter=d --name-only $(git merge-base HEAD origin/master) -- "***.hs" && git ls-files -o --exclude-standard -- "***.hs"; } | xargs hlint
 ```
 
-Because hlint's `--refactor` option only works when you pass a single file, this approach is also helpful to enable refactoring many files in a single command:
-
-```bash
-{ git diff --diff-filter=d --name-only $(git merge-base HEAD origin/master) -- "***.hs" && git ls-files -o --exclude-standard -- "***.hs"; } | xargs -I file hlint file --refactor --refactor-options="--inplace --step"
-```
-
 ### Configuration
 
 #### Why doesn't HLint know the fixity for my custom !@%$ operator?
@@ -447,7 +441,7 @@ and `qualifiedStyle` fields, only the first definition will take effect.
 - modules:
   - {name: [Data.Map, Data.Map.*], as: Map}
   - {name: Test.Hspec, within: **.*Spec }
-  - {name: '**', importStyle: post}
+  - {name: '**', qualifiedStyle: post}
 ```
 
 ## Hacking HLint

README.md

@@ -0,0 +1 @@
+packages: ./hlint.cabal