diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-10-29 02:29:38 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-10-31 12:00:53 +0100 |
| commit | 345fbe0666a3b885b0080fef5756cacd0e64fe37 (patch) | |
| tree | 6d8d5cb6f67bb93a54dd83be4744bc86e6a33449 /.gitlab-ci | |
| parent | fdaa8a334a5913a043966dd019262be86f910895 (diff) | |
| download | glib-345fbe0666a3b885b0080fef5756cacd0e64fe37.tar.gz | |
ci/test-msys2: use $MINGW_PACKAGE_PREFIX
Diffstat (limited to '.gitlab-ci')
| -rw-r--r--[-rwxr-xr-x] | .gitlab-ci/test-msys2.sh | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index fa68d58f4..c834e81ad 100755..100644 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -1,29 +1,24 @@ #!/bin/bash -set -e +set -ex export PATH="/c/msys64/$MSYSTEM/bin:$PATH" -if [[ "$MSYSTEM" == "MINGW32" ]]; then - export MSYS2_ARCH="i686" -else - export MSYS2_ARCH="x86_64" -fi pacman --noconfirm -Suy pacman --noconfirm -S --needed \ base-devel \ lcov \ - mingw-w64-$MSYS2_ARCH-ccache \ - mingw-w64-$MSYS2_ARCH-gettext \ - mingw-w64-$MSYS2_ARCH-libffi \ - mingw-w64-$MSYS2_ARCH-meson \ - mingw-w64-$MSYS2_ARCH-pcre2 \ - mingw-w64-$MSYS2_ARCH-python3 \ - mingw-w64-$MSYS2_ARCH-python-pip \ - mingw-w64-$MSYS2_ARCH-toolchain \ - mingw-w64-$MSYS2_ARCH-zlib \ - mingw-w64-$MSYS2_ARCH-libelf + "${MINGW_PACKAGE_PREFIX}"-ccache \ + "${MINGW_PACKAGE_PREFIX}"-gettext \ + "${MINGW_PACKAGE_PREFIX}"-libffi \ + "${MINGW_PACKAGE_PREFIX}"-meson \ + "${MINGW_PACKAGE_PREFIX}"-pcre2 \ + "${MINGW_PACKAGE_PREFIX}"-python3 \ + "${MINGW_PACKAGE_PREFIX}"-python-pip \ + "${MINGW_PACKAGE_PREFIX}"-toolchain \ + "${MINGW_PACKAGE_PREFIX}"-zlib \ + "${MINGW_PACKAGE_PREFIX}"-libelf mkdir -p _coverage mkdir -p _ccache |