Skip to content

Commit aaf350c

Browse files
nicolasstuckisjrd
nicolasstucki
authored and
sjrd
committed
Replace io.js 2.0 with Node.js v4.2.1.
io.js 2.0 has bugs on rest parameters in constructors.
1 parent 9d7ff15 commit aaf350c

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

‎ci/matrix.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,18 @@
108108
<task id="test-suite-ecma-script6"><![CDATA[
109109
setJavaVersion $java
110110
sbtretry 'set Seq(testSuite, noIrCheckTest).map(pr => scalaJSOutputMode in pr := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6)' \
111-
'set Seq(testSuite, noIrCheckTest).map(pr => postLinkJSEnv in pr := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters")).value.withSourceMap(false))' \
111+
'set Seq(testSuite, noIrCheckTest).map(pr => postLinkJSEnv in pr := NodeJSEnv(args = Seq("--harmony-rest-parameters")).value.withSourceMap(false))' \
112112
'set scalaJSStage in Global := FastOptStage' \
113113
++$scala testSuite/test noIrCheckTest/test \
114114
testSuite/clean noIrCheckTest/clean &&
115115
sbtretry 'set scalaJSOutputMode in testSuite := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6' \
116-
'set postLinkJSEnv in testSuite := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters")).value.withSourceMap(false)' \
116+
'set postLinkJSEnv in testSuite := NodeJSEnv(args = Seq("--harmony-rest-parameters")).value.withSourceMap(false)' \
117117
'set scalaJSOptimizerOptions in testSuite ~= (_.withDisableOptimizer(true))' \
118118
'set scalaJSStage in Global := FastOptStage' \
119119
++$scala testSuite/test \
120120
testSuite/clean &&
121121
sbtretry 'set scalaJSOutputMode in testSuite := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6' \
122-
'set postLinkJSEnv in testSuite := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters")).value.withSourceMap(false)' \
122+
'set postLinkJSEnv in testSuite := NodeJSEnv(args = Seq("--harmony-rest-parameters")).value.withSourceMap(false)' \
123123
'set scalaJSSemantics in testSuite ~= {
124124
_.withAsInstanceOfs(org.scalajs.core.tools.sem.CheckedBehavior.Compliant)
125125
.withModuleInit(org.scalajs.core.tools.sem.CheckedBehavior.Compliant)
@@ -129,7 +129,7 @@
129129
++$scala testSuite/test \
130130
testSuite/clean &&
131131
sbtretry 'set scalaJSOutputMode in testSuite := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6' \
132-
'set postLinkJSEnv in testSuite := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters")).value.withSourceMap(false)' \
132+
'set postLinkJSEnv in testSuite := NodeJSEnv(args = Seq("--harmony-rest-parameters")).value.withSourceMap(false)' \
133133
'set scalaJSSemantics in testSuite ~= {
134134
_.withAsInstanceOfs(org.scalajs.core.tools.sem.CheckedBehavior.Compliant)
135135
.withModuleInit(org.scalajs.core.tools.sem.CheckedBehavior.Compliant)
@@ -140,13 +140,13 @@
140140
++$scala testSuite/test \
141141
testSuite/clean &&
142142
sbtretry 'set scalaJSOutputMode in testSuite := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6' \
143-
'set postLinkJSEnv in testSuite := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters")).value.withSourceMap(false)' \
143+
'set postLinkJSEnv in testSuite := NodeJSEnv(args = Seq("--harmony-rest-parameters")).value.withSourceMap(false)' \
144144
'set scalaJSSemantics in testSuite ~= { _.optimized }' \
145145
'set scalaJSStage in Global := FastOptStage' \
146146
++$scala testSuite/test \
147147
testSuite/clean &&
148148
sbtretry 'set scalaJSOutputMode in testSuite := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6' \
149-
'set postLinkJSEnv in testSuite := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters")).value.withSourceMap(false)' \
149+
'set postLinkJSEnv in testSuite := NodeJSEnv(args = Seq("--harmony-rest-parameters")).value.withSourceMap(false)' \
150150
'set scalaJSSemantics in testSuite ~= { _.optimized }' \
151151
'set scalaJSOptimizerOptions in testSuite ~= (_.withDisableOptimizer(true))' \
152152
'set scalaJSStage in Global := FastOptStage' \
@@ -157,18 +157,18 @@
157157
<task id="test-suite-ecma-script6-strong-mode"><![CDATA[
158158
setJavaVersion $java
159159
sbtretry 'set Seq(testSuite, noIrCheckTest).map(pr => scalaJSOutputMode in pr := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6StrongMode)' \
160-
'set Seq(testSuite, noIrCheckTest).map(pr => postLinkJSEnv in pr := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false))' \
160+
'set Seq(testSuite, noIrCheckTest).map(pr => postLinkJSEnv in pr := NodeJSEnv(args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false))' \
161161
'set scalaJSStage in Global := FastOptStage' \
162162
++$scala testSuite/test noIrCheckTest/test \
163163
testSuite/clean noIrCheckTest/clean &&
164164
sbtretry 'set scalaJSOutputMode in testSuite := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6StrongMode' \
165-
'set postLinkJSEnv in testSuite := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false)' \
165+
'set postLinkJSEnv in testSuite := NodeJSEnv(args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false)' \
166166
'set scalaJSOptimizerOptions in testSuite ~= (_.withDisableOptimizer(true))' \
167167
'set scalaJSStage in Global := FastOptStage' \
168168
++$scala testSuite/test \
169169
testSuite/clean &&
170170
sbtretry 'set scalaJSOutputMode in testSuite := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6StrongMode' \
171-
'set postLinkJSEnv in testSuite := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false)' \
171+
'set postLinkJSEnv in testSuite := NodeJSEnv(args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false)' \
172172
'set scalaJSSemantics in testSuite ~= {
173173
_.withAsInstanceOfs(org.scalajs.core.tools.sem.CheckedBehavior.Compliant)
174174
.withModuleInit(org.scalajs.core.tools.sem.CheckedBehavior.Compliant)
@@ -178,7 +178,7 @@
178178
++$scala testSuite/test \
179179
testSuite/clean &&
180180
sbtretry 'set scalaJSOutputMode in testSuite := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6StrongMode' \
181-
'set postLinkJSEnv in testSuite := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false)' \
181+
'set postLinkJSEnv in testSuite := NodeJSEnv(args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false)' \
182182
'set scalaJSSemantics in testSuite ~= {
183183
_.withAsInstanceOfs(org.scalajs.core.tools.sem.CheckedBehavior.Compliant)
184184
.withModuleInit(org.scalajs.core.tools.sem.CheckedBehavior.Compliant)
@@ -189,13 +189,13 @@
189189
++$scala testSuite/test \
190190
testSuite/clean &&
191191
sbtretry 'set scalaJSOutputMode in testSuite := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6StrongMode' \
192-
'set postLinkJSEnv in testSuite := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false)' \
192+
'set postLinkJSEnv in testSuite := NodeJSEnv(args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false)' \
193193
'set scalaJSSemantics in testSuite ~= { _.optimized }' \
194194
'set scalaJSStage in Global := FastOptStage' \
195195
++$scala testSuite/test \
196196
testSuite/clean &&
197197
sbtretry 'set scalaJSOutputMode in testSuite := org.scalajs.core.tools.javascript.OutputMode.ECMAScript6StrongMode' \
198-
'set postLinkJSEnv in testSuite := NodeJSEnv(executable = "/home/jenkins/apps/iojs-2.0/bin/iojs", args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false)' \
198+
'set postLinkJSEnv in testSuite := NodeJSEnv(args = Seq("--harmony-rest-parameters", "--strong-mode")).value.withSourceMap(false)' \
199199
'set scalaJSSemantics in testSuite ~= { _.optimized }' \
200200
'set scalaJSOptimizerOptions in testSuite ~= (_.withDisableOptimizer(true))' \
201201
'set scalaJSStage in Global := FastOptStage' \

0 commit comments

Comments
 (0)