From f84c31842094ea1ca9d8b11e037e5298cbcae103 Mon Sep 17 00:00:00 2001 From: k0kubun Date: Wed, 24 Oct 2018 12:19:39 +0000 Subject: revert r65353 [ci skip] As Wercker is managing workflow by GUI, the commit had no impact for behavior... I already fixed the workflow on GUI. Let revert that to change it back to natural order. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- wercker.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'wercker.yml') diff --git a/wercker.yml b/wercker.yml index f3efbd91a3..71d15a3739 100644 --- a/wercker.yml +++ b/wercker.yml @@ -6,7 +6,7 @@ box: ruby:2.5-stretch no-response-timeout: 30 command-timeout: 60 -test-mjit-wait: +test-mjit: steps: - install-packages: packages: bison sudo @@ -23,27 +23,23 @@ test-mjit-wait: name: make all install code: /usr/bin/sudo -H -u test -- make -j$(nproc) all install - script: - name: make test (JIT wait) - code: /usr/bin/sudo -H -u test -- make test RUN_OPTS="--disable-gems --jit-wait --jit-warnings" - # split test-all to 2 steps to loosen timeout - - script: - name: make test-all1 (JIT wait) # only: test/ruby/, test/testunit/ - code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTS="test/ruby/ test/testunit/" TESTOPTS="--color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait" + name: make test (JIT) + code: /usr/bin/sudo -H -u test -- make test RUN_OPTS="--disable-gems --jit --jit-warnings" - script: - name: make test-all2 (JIT wait) # except: test/ruby/, test/testunit/ - code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTOPTS="--exclude test/ruby/ --exclude test/testunit/ --color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait" + name: make test-all (JIT) + code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit --jit-warnings" TESTOPTS="--color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit" - script: - name: make test-spec (JIT wait) - code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit-wait --jit-warnings" + name: make test-spec (JIT) + code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit --jit-warnings" after-steps: - wantedly/pretty-slack-notify: webhook_url: $SLACK_WEBHOOK_URL - username: Wercker test-mjit-wait + username: Wercker test-mjit channel: alerts notify_on: "failed" branches: ^trunk$ -test-mjit: +test-mjit-wait: steps: - install-packages: packages: bison sudo @@ -60,18 +56,22 @@ test-mjit: name: make all install code: /usr/bin/sudo -H -u test -- make -j$(nproc) all install - script: - name: make test (JIT) - code: /usr/bin/sudo -H -u test -- make test RUN_OPTS="--disable-gems --jit --jit-warnings" + name: make test (JIT wait) + code: /usr/bin/sudo -H -u test -- make test RUN_OPTS="--disable-gems --jit-wait --jit-warnings" + # split test-all to 2 steps to loosen timeout - script: - name: make test-all (JIT) - code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit --jit-warnings" TESTOPTS="--color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit" + name: make test-all1 (JIT wait) # only: test/ruby/, test/testunit/ + code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTS="test/ruby/ test/testunit/" TESTOPTS="--color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait" - script: - name: make test-spec (JIT) - code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit --jit-warnings" + name: make test-all2 (JIT wait) # except: test/ruby/, test/testunit/ + code: /usr/bin/sudo -H -u test -- make test-all RUN_OPTS="--disable-gems --jit-wait --jit-warnings" TESTOPTS="--exclude test/ruby/ --exclude test/testunit/ --color=never --job-status=normal --longest 10 --subprocess-timeout-scale=3.0 --excludes=test/excludes/_wercker/test-mjit-wait" + - script: + name: make test-spec (JIT wait) + code: /usr/bin/sudo -H -u test -- make test-spec RUN_OPTS="--disable-gems --jit-wait --jit-warnings" after-steps: - wantedly/pretty-slack-notify: webhook_url: $SLACK_WEBHOOK_URL - username: Wercker test-mjit + username: Wercker test-mjit-wait channel: alerts notify_on: "failed" branches: ^trunk$ -- cgit v1.2.3