Skip to content

Commit

Permalink
Rename HLINTVER to HLINT_VERSION
Browse files Browse the repository at this point in the history
  • Loading branch information
harendra-kumar committed Dec 17, 2023
1 parent 126bc52 commit 60ad81f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/packcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
command: hlint
runner: ubuntu-latest
pack_options: >-
HLINTVER=3.6.1
HLINT_VERSION=3.6.1
HLINT_OPTIONS="lint"
HLINT_TARGETS="src"
Expand Down
2 changes: 1 addition & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Explicit `hlint` command was added. Use
`packcheck hlint HLINT_OPTIONS="lint" ...` instead of
`packcheck cabal-v2 HLINT_OPTIONS="lint" ...` to run hlint on the package.
* `HLINTVER` env var can be used to install a specific version of hlint instead
* `HLINT_VERSION` env var can be used to install a specific version of hlint instead
of using one in PATH.
* Removed GHCJS, coveralls support
* Removed `CABAL_HACKAGE_MIRROR` env var
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ CABALVER : [a.b.c.d] Cabal version (prefix) to use
STACKVER : [a.b.c.d] Stack version (prefix) to use
STACK_UPGRADE : [y] DESTRUCTIVE! Upgrades stack to latest version
RESOLVER : Stack resolver to use for stack builds or cabal builds using stack
HLINTVER : Download a specific version binary of hlint instead of using one in PATH
HLINT_VERSION : Download a specific version binary of hlint instead of using one in PATH
--------------------------------------------------
Where to find the required tools
Expand Down
10 changes: 5 additions & 5 deletions packcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ SAFE_ENVVARS="\
CABAL_BUILD_TARGETS \
COVERAGE \
COVERALLS_OPTIONS \
HLINTVER \
HLINT_VERSION \
HLINT_BUILD \
HLINT_COMMANDS \
HLINT_OPTIONS \
Expand Down Expand Up @@ -360,7 +360,7 @@ show_help() {
help_envvar STACKVER "[a.b.c.d] Stack version (prefix) to use"
help_envvar STACK_UPGRADE "[y] DESTRUCTIVE! Upgrades stack to latest version"
help_envvar RESOLVER "Stack resolver to use for stack builds or cabal builds using stack"
help_envvar HLINTVER "Download a specific version binary of hlint instead of using one in PATH"
help_envvar HLINT_VERSION "Download a specific version binary of hlint instead of using one in PATH"
help_envvar DOCSPEC_VERSION "Download a specific version binary of docspec instead of using one in PATH"

show_step1 "Where to find the required tools"
Expand Down Expand Up @@ -1646,9 +1646,9 @@ install_hlint() {
fi

local PACKAGE=hlint
VERSION=$HLINTVER
VERSION=$HLINT_VERSION

echo "Installing hlint version $HLINTVER"
echo "Installing hlint version $HLINT_VERSION"

URL="https://github.com/ndmitchell/$PACKAGE/releases/download/v$VERSION/hlint-$VERSION-x86_64-$OS$EXT"
TEMP=$(mktemp -d .$PACKAGE-XXXXXX)
Expand Down Expand Up @@ -1995,7 +1995,7 @@ then
# Also, we need to initialize COMPILER variable before this which is
# done in verify_build_config happening after this.
build_hlint
elif test -n "$HLINTVER"
elif test -n "$HLINT_VERSION"
then
install_hlint
fi
Expand Down

0 comments on commit 60ad81f

Please sign in to comment.