From 33056ce3340782328130c39cec80eea6b3aea332 Mon Sep 17 00:00:00 2001 From: Fendor Date: Thu, 29 Feb 2024 14:34:39 +0100 Subject: [PATCH] Remove locale workaround for Module name that conatins non-ascii characters --- .github/scripts/build.sh | 3 --- .github/scripts/common.sh | 29 ----------------------------- 2 files changed, 32 deletions(-) diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh index 413890bfdf..d27a940e14 100644 --- a/.github/scripts/build.sh +++ b/.github/scripts/build.sh @@ -11,9 +11,6 @@ uname pwd env -# setup the locale as HLS contains non-ascii modules and content. -setup_locale - # ensure ghcup install_ghcup diff --git a/.github/scripts/common.sh b/.github/scripts/common.sh index dea3140a8e..dde41675cf 100644 --- a/.github/scripts/common.sh +++ b/.github/scripts/common.sh @@ -207,32 +207,3 @@ mktempdir() { ;; esac } - -# "Inspired" from GHC GitLab CI -# https://gitlab.haskell.org/ghc/ghc/-/blob/214b2b6916f2d016ab9db0b766060e7828bb47a0/.gitlab/ci.sh#L60 -setup_locale() { - # BSD grep terminates early with -q, consequently locale -a will get a - # SIGPIPE and the pipeline will fail with pipefail. - shopt -o -u pipefail - if locale -a | grep -q C.UTF-8; then - # Debian - export LANG=C.UTF-8 - elif locale -a | grep -q C.utf8; then - # Fedora calls it this - export LANG=C.utf8 - elif locale -a | grep -q en_US.UTF-8; then - # Centos doesn't have C.UTF-8 - export LANG=en_US.UTF-8 - elif locale -a | grep -q en_US.utf8; then - # Centos doesn't have C.UTF-8 - export LANG=en_US.utf8 - else - error "Failed to find usable locale" - info "Available locales:" - locale -a - fail "No usable locale, aborting..." - fi - info "Using locale $LANG..." - export LC_ALL=$LANG - shopt -o -s pipefail -}