From 3eb5687d1dc5236dab55930c58dcf7da2196234e Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Fri, 26 May 2017 17:19:48 +0200 Subject: [refactor] install helpers in makefile --- .gitlab-ci.yml | 4 +--- Makefile | 4 ++++ 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 -- cgit v1.2.3