Merge branch 'updates'

This commit is contained in:
Julian Ospald 2021-09-01 01:00:20 +02:00
commit 94637dfbab
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F
4 changed files with 8562 additions and 8546 deletions

View File

@ -14,7 +14,7 @@ variables:
############################################################ ############################################################
.debian: .debian:
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV" image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
tags: tags:
- x86_64-linux - x86_64-linux
variables: variables:
@ -527,15 +527,9 @@ release:windows:
hlint: hlint:
stage: hlint stage: hlint
extends: extends:
- .alpine:64bit - .debian
before_script:
- ./.gitlab/before_script/linux/alpine/install_deps.sh
script: script:
- ./.gitlab/script/hlint.sh - curl -sSL https://raw.github.com/ndmitchell/hlint/master/misc/run.sh | sh -s -- -r lib/ test/
variables:
GHC_VERSION: "8.10.6"
CABAL_VERSION: "3.4.0.0"
JSON_VERSION: "0.0.4"
allow_failure: true allow_failure: true
artifacts: artifacts:
expire_in: 2 week expire_in: 2 week

File diff suppressed because it is too large Load Diff

View File

@ -372,6 +372,13 @@ adjust_bashrc() {
echo "[[ -f ~/.bashrc ]] && source ~/.bashrc # ghcup-env" >> "${HOME}/.bash_profile" echo "[[ -f ~/.bashrc ]] && source ~/.bashrc # ghcup-env" >> "${HOME}/.bash_profile"
fi fi
;; ;;
MSYS*|MINGW*)
if [ ! -e "${HOME}/.bash_profile" ] ; then
echo '# generated by ghcup' > "${HOME}/.bash_profile"
echo 'test -f ~/.profile && . ~/.profile' >> "${HOME}/.bash_profile"
echo 'test -f ~/.bashrc && . ~/.bashrc' >> "${HOME}/.bash_profile"
fi
;;
esac esac
break ;; break ;;

View File

@ -413,6 +413,7 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
Print-Msg -msg 'Setting default home directory...' Print-Msg -msg 'Setting default home directory...'
Exec "$Bash" '-lc' "sed -i -e 's/db_home:.*$/db_home: windows/' /etc/nsswitch.conf" Exec "$Bash" '-lc' "sed -i -e 's/db_home:.*$/db_home: windows/' /etc/nsswitch.conf"
} elseif ($msys2Decision -eq 1) { } elseif ($msys2Decision -eq 1) {
Print-Msg -color Yellow -msg 'Skipping MSys2 installation.' Print-Msg -color Yellow -msg 'Skipping MSys2 installation.'
while ($true) { while ($true) {