aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-05-17 00:33:30 +0800
committerchriseth <chris@ethereum.org>2018-05-17 00:33:30 +0800
commit87a838583290d66f4d4d78149a6d7398a41750ec (patch)
tree765d0398dbb505fde38d612e8113306486e6f76e
parent22ff3b736a9bd3a44dbe2c3f31ad4505babd2248 (diff)
downloaddexon-solidity-87a838583290d66f4d4d78149a6d7398a41750ec.tar.gz
dexon-solidity-87a838583290d66f4d4d78149a6d7398a41750ec.tar.zst
dexon-solidity-87a838583290d66f4d4d78149a6d7398a41750ec.zip
Remove merge blocker.
-rw-r--r--circle.yml9
1 files changed, 0 insertions, 9 deletions
diff --git a/circle.yml b/circle.yml
index 5df0609e..4ce3082b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -213,19 +213,10 @@ jobs:
path: docs/_build/html/
destination: docs-html
- merge_blocker:
- docker:
- - image: buildpack-deps:artful
- steps:
- - run:
- name: This blocks the merge. Remove when 0.5.0 is to be released.
- command: false
-
workflows:
version: 2
build_all:
jobs:
- - merge_blocker
- build_emscripten: *build_on_tags
- test_emscripten_solcjs:
<<: *build_on_tags