Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/packcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ jobs:
#PATH_VAR="$PATH_VAR:/usr/local/.ghcup/bin"
;;
CYGWIN*|MINGW*|MSYS*)
for var in APPDATA CABAL_DIR; do
for var in APPDATA CABAL_DIR TEMP TMP; do
val="${!var}"
[ -n "$val" ] && ARGS="$ARGS $var=\"$(cygpath -u "$val")\""
done
Expand Down
2 changes: 2 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* Add `CABAL_INDEX_TTL` option - do not attempt cabal update until it is
stale by this many hours, saves some build time.
* Windows: Support installing ghc using ghcup.
* Windows: Allow `TEMP` and `TMP` on the command line, so that programs
use the system temporary directory instead of the Windows directory.
* Caching: New `BUILD_ONLY_DEPS` and `BUILD_POST_DEPS` flags to
allow pausing/resuming builds for CI cache optimization.
* Diagnostics: Enhanced machine info captures `df`, `mount`, and
Expand Down
32 changes: 17 additions & 15 deletions packcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,8 @@ GHCRTS \
ALLOW_WIN_ENVVARS="\
WINVER \
APPDATA \
TEMP \
TMP \
NUMBER_OF_PROCESSORS \
PROCESSOR_IDENTIFIER \
"
Expand Down Expand Up @@ -2152,15 +2154,15 @@ install_hlint() {
VERSION=$HLINT_VERSION

URL="$HLINT_URL_PREFIX/download/v$VERSION/hlint-$VERSION-x86_64-$OS$EXT"
TEMP=$(mktemp -d .$PACKAGE-XXXXXX)
HLINT_TMP_DIR=$(mktemp -d .$PACKAGE-XXXXXX)

cleanup(){
rm -r $TEMP
rm -r $HLINT_TMP_DIR
}
trap cleanup EXIT

echo $URL
retry_cmd curl --fail --progress-bar --location -o$TEMP/$PACKAGE$EXT $URL
retry_cmd curl --fail --progress-bar --location -o$HLINT_TMP_DIR/$PACKAGE$EXT $URL
if test "$?" -ne 0
then
die "Failed to download $URL"
Expand All @@ -2173,14 +2175,14 @@ install_hlint() {

mkdir -p ${LOCAL_BIN}
if [ "$OS" = "windows" ]; then
7z x -y $TEMP/$PACKAGE$EXT -o${TEMP} hlint-$VERSION/hlint.exe > /dev/null
mv ${TEMP}/hlint-${VERSION}/hlint.exe ${LOCAL_BIN}
7z x -y $HLINT_TMP_DIR/$PACKAGE$EXT -o${HLINT_TMP_DIR} hlint-$VERSION/hlint.exe > /dev/null
mv ${HLINT_TMP_DIR}/hlint-${VERSION}/hlint.exe ${LOCAL_BIN}
elif [ "$OS" = "osx" ]; then
tar -xzvf $TEMP/$PACKAGE$EXT -C${TEMP} --include '*/hlint'
mv ${TEMP}/hlint-${VERSION}/hlint ${LOCAL_BIN}
tar -xzvf $HLINT_TMP_DIR/$PACKAGE$EXT -C${HLINT_TMP_DIR} --include '*/hlint'
mv ${HLINT_TMP_DIR}/hlint-${VERSION}/hlint ${LOCAL_BIN}
else
tar -xzvf $TEMP/$PACKAGE$EXT -C${TEMP} --wildcards '*/hlint'
mv ${TEMP}/hlint-${VERSION}/hlint ${LOCAL_BIN}
tar -xzvf $HLINT_TMP_DIR/$PACKAGE$EXT -C${HLINT_TMP_DIR} --wildcards '*/hlint'
mv ${HLINT_TMP_DIR}/hlint-${VERSION}/hlint ${LOCAL_BIN}
fi
chmod +x $HLINT_PATH
}
Expand Down Expand Up @@ -2307,9 +2309,9 @@ install_docspec() {
*) die "install_docspec: unknown or unsupported os";;
esac

TEMP=$(mktemp -d docspec-XXXXXX)
DOCSPEC_TMP_DIR=$(mktemp -d docspec-XXXXXX)
cleanup(){
rm -r $TEMP
rm -r $DOCSPEC_TMP_DIR
}
trap cleanup EXIT

Expand All @@ -2318,10 +2320,10 @@ install_docspec() {
# directly instead of version.
#URL="$DOCSPEC_URL_PREFIX/download/cabal-docspec-$DOCSPEC_VERSION/cabal-docspec-$DOCSPEC_VERSION-x86_64-$OS.xz"
#echo "Downloading $URL ..."
retry_cmd curl --fail --progress-bar --location -o$TEMP/cabal-docspec.xz $DOCSPEC_URL
retry_cmd curl --fail --progress-bar --location -o$DOCSPEC_TMP_DIR/cabal-docspec.xz $DOCSPEC_URL
if test "$?" -ne 0
then
rm -f $TEMP/cabal-docspec.xz
rm -f $DOCSPEC_TMP_DIR/cabal-docspec.xz
die "Failed to download $DOCSPEC_URL"
fi

Expand All @@ -2330,8 +2332,8 @@ install_docspec() {
die "$DOCSPEC_PATH already exists, not overwriting."
else
mkdir -p $(dirname ${DOCSPEC_PATH})
xz -d < $TEMP/cabal-docspec.xz > $DOCSPEC_PATH
rm -f $TEMP/cabal-docspec.xz
xz -d < $DOCSPEC_TMP_DIR/cabal-docspec.xz > $DOCSPEC_PATH
rm -f $DOCSPEC_TMP_DIR/cabal-docspec.xz
chmod +x $DOCSPEC_PATH
fi
}
Expand Down
Loading