gitlab-ci: fix Windows CI builds.

Seems that msys2 packages can sometimes be compressed as `.tar.zst`
instead of `.tar.xz`. I updated crossroad to handle this case. It now
requires the additional pypi `zstandard` package.
This commit is contained in:
Jehan 2020-04-27 14:46:11 +02:00
parent 49351777b6
commit a1fc6144da
1 changed files with 4 additions and 0 deletions

View File

@ -192,12 +192,14 @@ deps-win64:
pkg-config
python3-distutils
python3-docutils
python3-pip
rpm
- apt-get install -y --reinstall ca-certificates
- git clone --depth=${GIT_DEPTH} git://git.tuxfamily.org/gitroot/crossroad/crossroad.git
- cd crossroad
- ./setup.py install --prefix=`pwd`/../.local
- cd ..
- pip3 install zstandard
script:
- export PATH="`pwd`/.local/bin:$PATH"
- crossroad w64 gimp --run="build/windows/crossbuild-gitlab-ci/build-deps.sh"
@ -276,12 +278,14 @@ deps-win32:
pkg-config
python3-distutils
python3-docutils
python3-pip
rpm
- apt-get install -y --reinstall ca-certificates
- git clone --depth=${GIT_DEPTH} git://git.tuxfamily.org/gitroot/crossroad/crossroad.git
- cd crossroad
- ./setup.py install --prefix=`pwd`/../.local
- cd ..
- pip3 install zstandard
script:
- export PATH="`pwd`/.local/bin:$PATH"
- crossroad w32 gimp --run="build/windows/crossbuild-gitlab-ci/build-deps.sh"