From 034744567a0c921817bb33c1878e4f63f42f27d5 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 16 Aug 2023 16:37:58 +0100
Subject: [PATCH] ci: Build relocatable bindist on windows
We now build the relocatable bindist target on windows, which means we
test and distribute the new method of creating a relocatable bindist.
---
.gitlab/ci.sh | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 659320b756d9..a8651c29542f 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -490,8 +490,16 @@ function build_hadrian() {
if [[ -n "${REINSTALL_GHC:-}" ]]; then
run_hadrian build-cabal -V
else
- run_hadrian test:all_deps binary-dist -V
- mv _build/bindist/ghc*.tar.xz "$BIN_DIST_NAME.tar.xz"
+ case "$(uname)" in
+ MSYS_*|MINGW*)
+ run_hadrian test:all_deps reloc-binary-dist -V
+ mv _build/reloc-bindist/ghc*.tar.xz "$BIN_DIST_NAME.tar.xz"
+ ;;
+ *)
+ run_hadrian test:all_deps binary-dist -V
+ mv _build/bindist/ghc*.tar.xz "$BIN_DIST_NAME.tar.xz"
+ ;;
+ esac
fi
}
--
GitLab