From d7e18f55999bdaae1a64d6d25ac5be5eac636e09 Mon Sep 17 00:00:00 2001
From: armin <armin.felder@osalliance.com>
Date: Sun, 20 May 2018 23:34:32 +0200
Subject: [PATCH] x
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6772fc..1fc03cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ job1:
- docker cp ./tests/mongodump/ ci-$CI_COMMIT_SHA-db:/mongodump/
- docker exec ci-$CI_COMMIT_SHA-db /bin/bash -c "mongorestore /mongodump"
- docker run --name ci-$CI_COMMIT_SHA-rc0640 --link ci-$CI_COMMIT_SHA-db --env MONGO_URL=mongodb://ci-$CI_COMMIT_SHA-db/rocketchat -d rocketchat/rocket.chat:0.64.0
- - docker create --name ci-$CI_COMMIT_SHA-qt-android-docker -v ~/.gradle:/root/.gradle -v ~/.ccache:/root/.ccache --link ci-$CI_COMMIT_SHA-rc0640:rc afelder/qt-android-docker /bin/bash -c "mkdir -p /src/build && cd /src/build && ls /src && /opt/Qt/5.9.5/gcc_64/bin/qmake -spec linux-g++ CONFIG+=test DEFINES+=MAJOR=0 DEFINES+=MINOR=64 DEFINES+=PATCH=0 ../engine.pro"
+ - docker create --name ci-$CI_COMMIT_SHA-qt-android-docker -v ~/.gradle:/root/.gradle -v ~/.ccache:/root/.ccache --link ci-$CI_COMMIT_SHA-rc0640:rc afelder/qt5-gcc64-docker /bin/bash -c "mkdir -p /src/build && cd /src/build && ls /src && /opt/Qt/5.9.5/gcc_64/bin/qmake -spec linux-g++ CONFIG+=test DEFINES+=MAJOR=0 DEFINES+=MINOR=64 DEFINES+=PATCH=0 ../engine.pro"
- docker cp ./ ci-$CI_COMMIT_SHA-qt-android-docker:/src/
- docker start ci-$CI_COMMIT_SHA-qt-android-docker -a
after_script:
--
GitLab