Skip to content

Commit d04d684

Browse files
Merge pull request #9934 from dotty-staging/windows-ci
add basic windows job settings
2 parents c98e187 + 6e2dcdb commit d04d684

File tree

5 files changed

+47
-20
lines changed

5 files changed

+47
-20
lines changed

Diff for: .github/workflows/ci.yaml

+37-10
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111

1212
jobs:
1313
test:
14-
runs-on: [self-hosted, linux]
14+
runs-on: [self-hosted, Linux]
1515
container: lampepfl/dotty:2020-04-24
1616

1717
steps:
@@ -54,7 +54,7 @@ jobs:
5454
./project/scripts/cmdTests
5555
5656
test_bootstrapped:
57-
runs-on: [self-hosted, linux]
57+
runs-on: [self-hosted, Linux]
5858
container: lampepfl/dotty:2020-04-24
5959

6060
steps:
@@ -96,8 +96,35 @@ jobs:
9696
./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;configureIDE"
9797
./project/scripts/bootstrapCmdTests
9898
99+
100+
test-windows:
101+
runs-on: [self-hosted, Windows]
102+
103+
steps:
104+
- name: Git Checkout
105+
uses: actions/checkout@v2
106+
107+
- name: Test
108+
run: sbt ";compile ;test"
109+
shell: cmd
110+
111+
test_bootstrapped-windows:
112+
runs-on: [self-hosted, Windows]
113+
114+
steps:
115+
- name: Git Checkout
116+
uses: actions/checkout@v2
117+
118+
- name: Test
119+
run: sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
120+
shell: cmd
121+
122+
# - name: Scala.js Test
123+
# run: sbt ";sjsJUnitTests/test"
124+
# shell: cmd
125+
99126
community_build:
100-
runs-on: [self-hosted, linux]
127+
runs-on: [self-hosted, Linux]
101128
container: lampepfl/dotty:2020-04-24
102129

103130
steps:
@@ -138,7 +165,7 @@ jobs:
138165
./project/scripts/sbt community-build/test
139166
140167
test_sbt:
141-
runs-on: [self-hosted, linux]
168+
runs-on: [self-hosted, Linux]
142169
container: lampepfl/dotty:2020-04-24
143170
if: (
144171
github.event_name == 'push' &&
@@ -181,7 +208,7 @@ jobs:
181208
run: ./project/scripts/sbt sbt-dotty/scripted
182209

183210
test_java8:
184-
runs-on: [self-hosted, linux]
211+
runs-on: [self-hosted, Linux]
185212
container: lampepfl/dotty:2020-04-24
186213
if: (
187214
github.event_name == 'push' &&
@@ -227,7 +254,7 @@ jobs:
227254
run: ./project/scripts/sbt ";compile ;test"
228255

229256
publish_nightly:
230-
runs-on: [self-hosted, linux]
257+
runs-on: [self-hosted, Linux]
231258
container: lampepfl/dotty:2020-04-24
232259
needs: [test, test_bootstrapped, community_build, test_sbt, test_java8]
233260
if: github.event_name == 'schedule'
@@ -274,7 +301,7 @@ jobs:
274301
./project/scripts/sbtPublish ";project dotty-bootstrapped ;publishSigned ;sonatypeBundleRelease"
275302
276303
nightly_documentation:
277-
runs-on: [self-hosted, linux]
304+
runs-on: [self-hosted, Linux]
278305
container: lampepfl/dotty:2020-04-24
279306
needs: [publish_nightly]
280307
if: github.event_name == 'schedule'
@@ -328,7 +355,7 @@ jobs:
328355
publish_branch: gh-pages
329356

330357
publish_release:
331-
runs-on: [self-hosted, linux]
358+
runs-on: [self-hosted, Linux]
332359
container: lampepfl/dotty:2020-04-24
333360
needs: [test, test_bootstrapped, community_build, test_sbt, test_java8]
334361
if: github.event_name == 'push' &&
@@ -423,7 +450,7 @@ jobs:
423450
asset_content_type: text/plain
424451

425452
release_documentation:
426-
runs-on: [self-hosted, linux]
453+
runs-on: [self-hosted, Linux]
427454
container: lampepfl/dotty:2020-04-24
428455
needs: [publish_release]
429456
if: github.event_name == 'push' &&
@@ -480,7 +507,7 @@ jobs:
480507
publish_branch: gh-pages
481508

482509
publish_sbt_release:
483-
runs-on: [self-hosted, linux]
510+
runs-on: [self-hosted, Linux]
484511
container: lampepfl/dotty:2020-04-24
485512
needs: [test, test_bootstrapped, community_build, test_sbt, test_java8]
486513
if: github.event_name == 'push' &&

Diff for: .jvmopts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
-Xss1m
22
-Xms512m
3-
-Xmx1200m
3+
-Xmx4096m
44
-XX:MaxInlineLevel=35
5+
-XX:ReservedCodeCacheSize=512m
6+
-XX:MaxMetaspaceSize=1024m

Diff for: compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting {
3030

3131
// Positive tests ------------------------------------------------------------
3232

33-
@Test def posMacros: Unit = {
33+
@Test def posMacros: Unit = if (!scala.util.Properties.isWin) {
3434
implicit val testGroup: TestGroup = TestGroup("compilePosMacros")
3535
aggregateTests(
3636
compileFilesInDir("tests/bench", defaultOptions),
@@ -139,7 +139,7 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting {
139139
).checkRuns()
140140
}
141141

142-
@Test def runBootstrappedOnly: Unit = {
142+
@Test def runBootstrappedOnly: Unit = if (!scala.util.Properties.isWin) {
143143
implicit val testGroup: TestGroup = TestGroup("runBootstrappedOnly")
144144
aggregateTests(
145145
compileFilesInDir("tests/run-bootstrapped", withCompilerOptions),
@@ -151,7 +151,7 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting {
151151
// Pickling tests are very memory intensive and as such need to be run with a
152152
// lower level of concurrency as to not kill their running VMs
153153

154-
@Test def picklingWithCompiler: Unit = {
154+
@Test def picklingWithCompiler: Unit = if (!scala.util.Properties.isWin) {
155155
val jvmBackendFilter = FileFilter.exclude(List("BTypes.scala", "Primitives.scala")) // TODO
156156
implicit val testGroup: TestGroup = TestGroup("testPicklingWithCompiler")
157157
aggregateTests(

Diff for: compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala

+4-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class VulpixUnitTests extends ParallelTesting {
2626
// To fail with something else than an AssertionError
2727
def fail(): Unit = throw new Exception("didn't fail properly")
2828

29-
@Test def missingFile: Unit =
29+
@Test def missingFile: Unit = if (!scala.util.Properties.isWin)
3030
try {
3131
compileFile("tests/vulpix-tests/unit/i-dont-exist.scala", defaultOptions).expectFailure.checkExpectedErrors()
3232
fail()
@@ -64,9 +64,8 @@ class VulpixUnitTests extends ParallelTesting {
6464
@Test def runDiffOutput1: Unit =
6565
compileFile("tests/vulpix-tests/unit/runDiffOutput1.scala", defaultOptions).expectFailure.checkRuns()
6666

67-
@Test def runStackOverflow: Unit =
68-
if (!scala.util.Properties.isWin)
69-
compileFile("tests/vulpix-tests/unit/stackOverflow.scala", defaultOptions).expectFailure.checkRuns()
67+
@Test def runStackOverflow: Unit = if (!scala.util.Properties.isWin)
68+
compileFile("tests/vulpix-tests/unit/stackOverflow.scala", defaultOptions).expectFailure.checkRuns()
7069

7170
@Test def runOutRedirects: Unit =
7271
compileFile("tests/vulpix-tests/unit/i2147.scala", defaultOptions).expectFailure.checkRuns()
@@ -83,7 +82,7 @@ class VulpixUnitTests extends ParallelTesting {
8382
@Test def deadlock: Unit =
8483
compileFile("tests/vulpix-tests/unit/deadlock.scala", defaultOptions).expectFailure.checkRuns()
8584

86-
@Test def badJava: Unit =
85+
@Test def badJava: Unit = if (!scala.util.Properties.isWin)
8786
try {
8887
compileFile("tests/vulpix-tests/unit/BadJava.java", defaultOptions).suppressAllOutput.checkCompile()
8988
fail()

Diff for: project/scripts/sbt

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ CMD="${1:?Missing sbt command}"
1010
sbt -J-Xmx4096m \
1111
-J-XX:ReservedCodeCacheSize=512m \
1212
-J-XX:MaxMetaspaceSize=1024m \
13-
-Ddotty.drone.mem=4096m \
1413
-DSBT_PGP_USE_GPG=false \
1514
-no-colors \
1615
"$CMD"

0 commit comments

Comments
 (0)