From b7a6b2f4c690a9711339462114a538a85dcb7d83 Mon Sep 17 00:00:00 2001
From: Gleb Popov <6yearold@gmail.com>
Date: Sat, 18 Apr 2020 23:02:39 +0400
Subject: [PATCH] gitlab-ci: Set locale to C.UTF-8.
---
.gitlab-ci.yml | 2 +-
.gitlab/ci.sh | 3 +++
docs/users_guide/compare-flags.py | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2b5cc3b6cf..bfa97897bd4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
GIT_SSL_NO_VERIFY: "1"
# Commit of ghc/ci-images repository from which to pull Docker images
- DOCKER_REV: 3f731f5d37a156e7ebe10cd32656946083baaf4a
+ DOCKER_REV: 6223fe0b5942f4fa35bdec92c74566cf195bfb42
# Sequential version number capturing the versions of all tools fetched by
# .gitlab/ci.sh.
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index d3e922ff863..6e1c6b0e810 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -26,6 +26,9 @@ LT_CYAN="1;36"
WHITE="1;37"
LT_GRAY="0;37"
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+
# GitLab Pipelines log section delimiters
# https://gitlab.com/gitlab-org/gitlab-foss/issues/14664
start_section() {
diff --git a/docs/users_guide/compare-flags.py b/docs/users_guide/compare-flags.py
index 5b588d99e06..5f0a1c9741e 100755
--- a/docs/users_guide/compare-flags.py
+++ b/docs/users_guide/compare-flags.py
@@ -62,7 +62,7 @@ def main() -> None:
parser = argparse.ArgumentParser()
parser.add_argument('--ghc', type=argparse.FileType('r'),
help='path of GHC executable')
- parser.add_argument('--doc-flags', type=argparse.FileType('r'),
+ parser.add_argument('--doc-flags', type=argparse.FileType(mode='r', encoding='UTF-8'),
help='path of ghc-flags.txt output from Sphinx')
args = parser.parse_args()
--
GitLab