summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-05-26 17:19:48 +0200
committerKali Kaneko (leap communications) <kali@leap.se>2017-06-07 12:31:23 +0200
commit3eb5687d1dc5236dab55930c58dcf7da2196234e (patch)
tree848b024c88f6905388d0a387c33b5dcb03db3a54
parenta3f7b764d68a4b28fdb816549d22d0ea2d4dcb11 (diff)
[refactor] install helpers in makefile
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--Makefile4
2 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0716c003..acfcd2e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,9 +54,7 @@ e2e_tests:
- source venv/bin/activate
- make dev-latest-backend
- mkdir -p /root/.config/leap/
- - apt install swaks
- - cp src/leap/bitmask/vpn/helpers/linux/bitmask-root /usr/local/sbin/
- - cp src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy /usr/share/polkit-1/actions/
+ - make install_helpers
- make test_e2e
tags:
- linux
diff --git a/Makefile b/Makefile
index ba4b201c..fbdfc416 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,10 @@ test_e2e:
#tests/e2e/e2e-test-mail.sh
tests/e2e/e2e-test-vpn.sh
+install_helpers:
+ cp src/leap/bitmask/vpn/helpers/linux/bitmask-root /usr/local/sbin/
+ cp src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy /usr/share/polkit-1/actions/
+
qt-resources:
pyrcc5 pkg/branding/icons.qrc -o src/leap/bitmask/gui/app_rc.py