aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreine <eine@users.noreply.github.com>2020-04-28 00:55:39 +0200
committereine <eine@users.noreply.github.com>2020-06-04 04:15:21 +0200
commitcbc8c2d184beedb4df343a7cb57011a3e50b7204 (patch)
tree15610905a877db864fdb001fb434712c8df4c1a8
parent803b1a25e54942cc9531380603e54ce052c943a5 (diff)
downloadghdl-cbc8c2d184beedb4df343a7cb57011a3e50b7204.tar.gz
ghdl-cbc8c2d184beedb4df343a7cb57011a3e50b7204.tar.bz2
ghdl-cbc8c2d184beedb4df343a7cb57011a3e50b7204.zip
ci/msys2: style
-rw-r--r--dist/msys2-mingw/run.sh22
1 files changed, 15 insertions, 7 deletions
diff --git a/dist/msys2-mingw/run.sh b/dist/msys2-mingw/run.sh
index 42af9f7e5..32f971322 100644
--- a/dist/msys2-mingw/run.sh
+++ b/dist/msys2-mingw/run.sh
@@ -54,9 +54,7 @@ gend () {
#---
-cd $(dirname $0)
-
-build () {
+do_build () {
gstart 'Install common build dependencies'
pacman -S --noconfirm base-devel
gend
@@ -90,7 +88,7 @@ build () {
gend
;;
*)
- echo "Unknown MING_INSTALLS=${MINGW_INSTALLS}!"
+ printf "${ANSI_RED}Unknown MING_INSTALLS=${MINGW_INSTALLS}!$ANSI_NOCOLOR"
exit 1
esac
gstart 'Install toolchain'
@@ -105,12 +103,18 @@ build () {
makepkg-mingw --noconfirm --noprogressbar -R
gend
+ gstart 'List artifacts'
+ ls -la
+ gend
+
gstart 'Install package'
pacman --noconfirm -U "mingw-w64-${TARBALL_ARCH}-ghdl-${TARGET}-ci"-*-any.pkg.tar.zst
gend
}
-test () {
+#---
+
+do_test () {
gstart 'Environment'
env | grep MSYSTEM
env | grep MINGW
@@ -119,11 +123,15 @@ test () {
GHDL=ghdl ../../testsuite/testsuite.sh
}
+#---
+
+cd $(dirname $0)
+
case "$1" in
-t)
- test
+ do_test
;;
*)
- build
+ do_build
;;
esac