summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-04-21 12:36:40 +0200
committerdrebs <drebs@leap.se>2017-07-03 14:19:58 -0300
commit4954cc67df3ff287b948f847c4cd842f333604cc (patch)
tree7e4f30cf29b5cfbbfb7f15110d87836eef89af22
parent1110b073c4150aa4d55ee4821d5fc7b1616f1bfc (diff)
[test] All PRs got merged
-rw-r--r--.gitlab-ci.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a47d1709..e19ba5d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,8 +79,6 @@ benchmark:
- git remote add leap https://leap.se/git/soledad
- git fetch leap
- git checkout leap/master testing/tox.ini testing/tests/benchmarks/conftest.py testing/tests/conftest.py
- - sed -i 's/drebs.*$/varac\/pytest-benchmark.git@unmerged_prs/' testing/tox.ini
- - grep -A 9 'testenv:benchmark' testing/tox.ini
- git status
- git show -s --pretty=fuller
- cd testing