summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2020-09-30 18:34:27 +0200
committerRuben Pollan <meskio@sindominio.net>2020-09-30 18:34:27 +0200
commit03534bdaeb9545136da1b5966b83190db4189560 (patch)
tree4602416c37b591d21442a9c607ca754f4173272b
parent3a36d9c6c67876c84a8dd65334c00ec8399c6979 (diff)
[test] fix CI with the new build target
-rw-r--r--.gitlab-ci.yml4
-rwxr-xr-x[-rw-r--r--]gui/build.sh0
2 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e960ea..46bcf31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,11 +9,9 @@ build_test:
image: registry.0xacab.org/leap/bitmask-vpn:latest
stage: build
script:
- - apt update
- - apt install -y qtbase5-dev qttools5-dev-tools qt5-qmake g++ qtdeclarative5-dev qt5-default
- make generate
- make test
- - ./build.sh
+ - make build
tags:
- linux
artifacts:
diff --git a/gui/build.sh b/gui/build.sh
index 1ded17e..1ded17e 100644..100755
--- a/gui/build.sh
+++ b/gui/build.sh