summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-12-05 20:05:46 +0100
committerKali Kaneko <kali@leap.se>2017-12-07 20:56:46 +0100
commitf6bf1920f9218928c0a9dea14db76e730dda770e (patch)
treeb4f6a517761515c6285ac69ca9991fee2b886b19 /.gitlab-ci.yml
parentce5cd2d49dac5f89deb0c10dee96160656fe2055 (diff)
[tests] enable osx runner
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml18
1 files changed, 8 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65c58b26..3b2f6449 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,16 +28,14 @@ linux_test:
tags:
- linux
-# Currently, our only OSX gitlab runner is unavailable too often
-# and the tests fail in CI anyway so we disable it for now until
-# we fix both.
-#osx_test:
-# stage: test
-# allow_failure: true
-# script:
-# - tox --recreate -e py27-dev
-# tags:
-# - osx
+osx_test:
+ stage: test
+ allow_failure: true
+ script:
+ - tox --recreate -e py27-dev
+ tags:
+ - yosemite
+ - osx
bitmask_latest_bundle:
image: 0xacab.org:4567/leap/bitmask-dev:latest