aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2021-04-27 23:41:35 +0200
committersfan5 <sfan5@live.de>2021-04-28 09:18:05 +0200
commit83a7b48bb1312cf9851706c2b6adc7877556e8d5 (patch)
treed97468722f1226facf8fad7b9c3bd58a551c1b1b
parent228f1c67704ab8014d30a3301bd15a1a88324ce0 (diff)
downloadminetest-83a7b48bb1312cf9851706c2b6adc7877556e8d5.tar.gz
minetest-83a7b48bb1312cf9851706c2b6adc7877556e8d5.tar.bz2
minetest-83a7b48bb1312cf9851706c2b6adc7877556e8d5.zip
Fix Windows pipelines on Gitlab-CI
-rw-r--r--.gitlab-ci.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e16cdfe5..597e7ab52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -171,10 +171,10 @@ build:fedora-28:
##
.generic_win_template:
- image: ubuntu:bionic
+ image: ubuntu:focal
before_script:
- apt-get update
- - apt-get install -y wget xz-utils unzip git cmake gettext
+ - DEBIAN_FRONTEND=noninteractive apt-get install -y wget xz-utils unzip git cmake gettext
- wget -nv http://minetest.kitsunemimi.pw/mingw-w64-${WIN_ARCH}_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
- tar -xaf mingw.tar.xz -C /usr
@@ -184,13 +184,13 @@ build:fedora-28:
artifacts:
expire_in: 1h
paths:
- - _build/*
+ - build/build/*.zip
.package_win_template:
extends: .generic_win_template
stage: package
script:
- - unzip _build/minetest-*.zip
+ - unzip build/build/*.zip
- cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libgcc*.dll minetest-*-win*/bin/
- cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libstdc++*.dll minetest-*-win*/bin/
- cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libwinpthread*.dll minetest-*-win*/bin/