diff options
| author | jak1 <mike.wollmann@gmail.com> | 2020-12-22 19:52:23 +0000 |
|---|---|---|
| committer | jak1 <mike.wollmann@gmail.com> | 2020-12-22 19:52:23 +0000 |
| commit | e6e6a323f62a9fd873b935cfa13afbfb3e7c8d81 (patch) | |
| tree | d698720d0224ab9950fcd5f0f3c2f0c98c5d34a6 /.gitlab-ci.yml | |
| parent | e2bbce0e2471cb66d7beeedf7e2b35e3f4c619ab (diff) | |
| parent | 27fcc6c422a003f07af14f2d4874ff8ee42e97e7 (diff) | |
| download | docker-windows-builder-e6e6a323f62a9fd873b935cfa13afbfb3e7c8d81.tar.gz docker-windows-builder-e6e6a323f62a9fd873b935cfa13afbfb3e7c8d81.tar.bz2 docker-windows-builder-e6e6a323f62a9fd873b935cfa13afbfb3e7c8d81.tar.xz docker-windows-builder-e6e6a323f62a9fd873b935cfa13afbfb3e7c8d81.zip | |
v1.0.3
**nsis test-build (-debug & -profiler)**\
**added:** build script for manaplus\
**updated:** docker image to v1.0.3\
**moved:** some commands from ci script to build scripts & Docker\
**patched:** temporary fix for manaplus(fix me later™)\
Closes #1
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba1a581..5904d68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,31 +10,20 @@ mxe_gcc5: # change me - branches@jak89_1/docker-testing script: - # TODO: plz move me in a seperate script - - mkdir /build - - mkdir /logs - cd / - # remove me - - ls -al # change me + - rm -rf /opt/ + - git clone https://gitlab.com/jak89_1/docker-testing.git -b $CI_COMMIT_BRANCH /opt || exit 1 + - rm -rf /opt/.git/ + - mv -f opt/* / - git clone https://gitlab.com/jak89_1/manaplus.git -b $CI_COMMIT_BRANCH || exit 1 - - cd /manaplus - - ./tools/ci/jobs/mxe_gcc5.sh - - 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/ - - 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/ + - chmod +x ./build_manaplus.sh && ./build_manaplus.sh + # copy artifacts - cp -r /build/ /builds/jak89_1/docker-testing/build - image: registry.gitlab.com/jak89_1/docker-testing:v1.0.2 + - mkdir -p /builds/jak89_1/docker-testing/logs/ + - cp /manaplus/build/tmp/config.log /builds/jak89_1/docker-testing/build/logs/ || true + - cp /manaplus/build/make2.log /builds/jak89_1/docker-testing/build/logs/ || true + image: registry.gitlab.com/jak89_1/docker-testing:v1.0.3 variables: CROSS: i686-w64-mingw32.shared artifacts: |