summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml43
1 files changed, 19 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee913fd..ba1a581 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,12 +4,6 @@ stages:
# - deploy
# - release
-before_script:
- - apt-get update
- - apt-get install -y -qq bash
- - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
-
mxe_gcc5:
stage: build
only:
@@ -17,35 +11,36 @@ mxe_gcc5:
- branches@jak89_1/docker-testing
script:
# TODO: plz move me in a seperate script
- - mkdir build
- - mkdir logs
+ - mkdir /build
+ - mkdir /logs
- cd /
# remove me
- ls -al
# change me
- git clone https://gitlab.com/jak89_1/manaplus.git -b $CI_COMMIT_BRANCH || exit 1
- - cd manaplus
- # change me in docker (laterâ„¢)
- - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /mxe/usr/i686-w64-mingw32.shared/include/SDL/SDL_opengl.h
+ - cd /manaplus
- ./tools/ci/jobs/mxe_gcc5.sh
- - find manaplus/src -type f -name "*.exe"
- - mv manaplus.exe /build
- - mv dyecmd.exe /build
- - /mxe/tools/copydlldeps.py -C/manaplus/src -L/mxe/usr/i686-w64-mingw32.shared/bin /build || true
+ - find /manaplus/src -type f -name "*.exe"
+ - cp /manaplus/src/manaplus.exe /build/
+ - cp /manaplus/src/dyecmd.exe /build/
+ - /mxe/tools/copydlldeps.py -C/manaplus/src/ -L/mxe/usr/i686-w64-mingw32.shared/bin/ /build/ || true
# TODO: nsis
- - cp -r /manaplus/data /build
- - cp /AUTHORS /build
- - cp /COPYING /build
- - cp /README.txt /build
- - cp packaging/windows/portable.xml /build
- - ls -al /build
- image: registry.gitlab.com/jak89_1/docker-testing:v1.0.1
+ - cp -r /manaplus/data/ /build/
+ - rm -rf /build/data/**/MakeFile.*
+ - rm -rf /build/data/**/CMakeLists.*
+ - cp /manaplus/AUTHORS /build/
+ - cp /manaplus/COPYING /build/
+ - cp /manaplus/README.txt /build/
+ - cp /manaplus/packaging/windows/portable.xml /build/
+ - ls -al /build/
+ - cp -r /build/ /builds/jak89_1/docker-testing/build
+ image: registry.gitlab.com/jak89_1/docker-testing:v1.0.2
variables:
CROSS: i686-w64-mingw32.shared
artifacts:
paths:
- - /build
- - /logs
+ - build
+ - logs
when: always
expire_in: 3 week
tags: