summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml17
-rw-r--r--src/leap/bitmask/util.py6
-rw-r--r--tox.ini3
3 files changed, 22 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3d256b..7cae846 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,20 @@ stages:
- build
- e2e
-test:
+linux_test:
image: leapcode/soledad:latest
stage: test
script:
- tox --recreate -e py27-dev
+ tags:
+ - linux
+
+osx_test:
+ stage: test
+ script:
+ - tox --recreate -e py27-dev
+ tags:
+ - osx
bitmask_latest_bundle:
image: leapcode/bitmask-dev:latest
@@ -19,12 +28,16 @@ bitmask_latest_bundle:
- dist/bitmask-*
name: "Bitmask_linux64_latest_${CI_BUILD_REF}"
expire_in: 1 month
+ tags:
+ - linux
build_ui:
image: leapcode/bitmask-dev:latest
stage: build
script:
- cd ui && make dev-build
+ tags:
+ - linux
e2e_tests:
image: leapcode/bitmask-dev:latest
@@ -37,3 +50,5 @@ e2e_tests:
- mkdir -p /root/.config/leap/
- apt install swaks
- make test_e2e
+ tags:
+ - linux
diff --git a/src/leap/bitmask/util.py b/src/leap/bitmask/util.py
index 5955128..3a7bacd 100644
--- a/src/leap/bitmask/util.py
+++ b/src/leap/bitmask/util.py
@@ -67,7 +67,8 @@ def get_gpg_bin_path():
os.path.join(here(), "..", "apps", "mail", "gpg"))
else:
try:
- gpgbin_options = which("gpg", path_extension='/usr/bin/')
+ path_ext = '/usr/bin/:/usr/local/opt/gnupg/bin/'
+ gpgbin_options = which("gpg", path_extension=path_ext)
# gnupg checks that the path to the binary is not a
# symlink, so we need to filter those and come up with
# just one option.
@@ -89,7 +90,8 @@ def get_gpg_bin_path():
# binary, in case it was renamed using dpkg-divert or manually.
# We could just pick gpg2, but we need to solve #7564 first.
try:
- gpgbin_options = which("gpg1", path_extension='/usr/bin')
+ path_ext = '/usr/bin/:/usr/local/opt/gnupg/bin/'
+ gpgbin_options = which("gpg1", path_extension=path_ext)
for opt in gpgbin_options:
if not os.path.islink(opt):
gpgbin = opt
diff --git a/tox.ini b/tox.ini
index b61f9e2..746f825 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,8 @@ deps =
-egit+https://0xacab.org/leap/soledad@master#egg=leap.soledad.client&subdirectory=client
setenv =
HOME=/tmp
- PATH=/usr/bin/:/bin/
+ CPPFLAGS='-I/usr/local/include/sqlcipher'
+ LDFLAGS='-L/usr/local/lib'
[testenv:py27-dev-local]
# This environment assumes leap_common and soledad repos