summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2020-04-08 16:34:02 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2020-04-08 16:34:02 +0000
commit358a6dd0c355e5c0c27d099d70c92fc6e9aeef9c (patch)
tree99a4a6ddfcee26507433a5213a4e53bd422a577d
parentf42dd713ecc9ae696b90fb5c91d838f7f4f9848f (diff)
parent8c9fa614ab01e9d6a3e48f94703d31ed1214d8d6 (diff)
downloadbuildstream-358a6dd0c355e5c0c27d099d70c92fc6e9aeef9c.tar.gz
Merge branch 'jjardon/wsl' into 'master'
Revert ".gitlab-ci.yml: Allow WSL test to fail" Closes #1277 See merge request BuildStream/buildstream!1860
-rw-r--r--.gitlab-ci.yml3
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8efca653c..51f755b26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -307,8 +307,6 @@ tests-wsl-master:
- master
except:
- schedules
- allow_failure: true
-
tests-wsl-non-master:
stage: test
@@ -330,7 +328,6 @@ tests-wsl-non-master:
when: manual
except:
- master
- allow_failure: true
# Automatically build documentation for every commit, we want to know
# if building documentation fails even if we're not deploying it.