diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 818db1667..973a978b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,15 @@ image: debian:stretch-slim build_ubuntu_18_04: stage: build image: ubuntu:bionic #only: # - merge_requests before_script: - sed -i -e 's/# deb-src/deb-src/g' /etc/apt/sources.list - apt-get update # basic - apt-get install --yes --no-install-recommends curl ca-certificates - # local build - - apt-get build-dep --yes --no-install-recommends umbrello - - apt-get install --yes --no-install-recommends ninja-build libkf5crash-dev + - chmod a+x maintainer/ci-build.sh script: - - sh -x maintainer/ci-build.sh + - maintainer/ci-build.sh diff --git a/maintainer/ci-build.sh b/maintainer/ci-build.sh index b1e1467f7..a1d4c0828 100644 --- a/maintainer/ci-build.sh +++ b/maintainer/ci-build.sh @@ -1,19 +1,22 @@ #!/bin/sh #------------------------ # dump env set #------------------------ # trigger obs windows build token=CBbFTso398hhg4WHESdUPE1n curl "http://173.212.229.51/cgi-bin/run-obs-build?repo=${CI_PROJECT_URL}.git&revision=$CI_COMMIT_SHORT_SHA&job=$CI_JOB_ID&apitoken=$token" #------------------------ # build unix variant if test -n "$CI_UNIX"; then + # local build + apt-get build-dep --yes --no-install-recommends umbrello + apt-get install --yes --no-install-recommends ninja-build libkf5crash-dev mkdir -p build && cd build cmake -G Ninja .. ninja fi