Skip to content

add basic windows job settings #9934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 9, 2020
Merged

add basic windows job settings #9934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5653022
add basic windows job settings
liufengyun Sep 30, 2020
d687a9b
Update .jvmopts
liufengyun Oct 2, 2020
6e2dcdb
Fix meta tests on Windows
liufengyun Oct 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 37 additions & 10 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:

jobs:
test:
runs-on: [self-hosted, linux]
runs-on: [self-hosted, Linux]
container: lampepfl/dotty:2020-04-24

steps:
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
./project/scripts/cmdTests

test_bootstrapped:
runs-on: [self-hosted, linux]
runs-on: [self-hosted, Linux]
container: lampepfl/dotty:2020-04-24

steps:
Expand Down Expand Up @@ -96,8 +96,35 @@ jobs:
./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;configureIDE"
./project/scripts/bootstrapCmdTests


test-windows:
runs-on: [self-hosted, Windows]

steps:
- name: Git Checkout
uses: actions/checkout@v2

- name: Test
run: sbt ";compile ;test"
shell: cmd

test_bootstrapped-windows:
runs-on: [self-hosted, Windows]

steps:
- name: Git Checkout
uses: actions/checkout@v2

- name: Test
run: sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
shell: cmd

# - name: Scala.js Test
# run: sbt ";sjsJUnitTests/test"
# shell: cmd
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is that disabled?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It causes a failure: https://github.com/lampepfl/dotty/runs/1225047885?check_suite_focus=true

Do you see clue from the message?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah ^^

Caused by: java.io.IOException: Cannot run program "node": CreateProcess error=2, The system cannot find the file specified

We need to install Node.js ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, thanks. I'm making a PR to enable it.


community_build:
runs-on: [self-hosted, linux]
runs-on: [self-hosted, Linux]
container: lampepfl/dotty:2020-04-24

steps:
Expand Down Expand Up @@ -138,7 +165,7 @@ jobs:
./project/scripts/sbt community-build/test

test_sbt:
runs-on: [self-hosted, linux]
runs-on: [self-hosted, Linux]
container: lampepfl/dotty:2020-04-24
if: (
github.event_name == 'push' &&
Expand Down Expand Up @@ -181,7 +208,7 @@ jobs:
run: ./project/scripts/sbt sbt-dotty/scripted

test_java8:
runs-on: [self-hosted, linux]
runs-on: [self-hosted, Linux]
container: lampepfl/dotty:2020-04-24
if: (
github.event_name == 'push' &&
Expand Down Expand Up @@ -227,7 +254,7 @@ jobs:
run: ./project/scripts/sbt ";compile ;test"

publish_nightly:
runs-on: [self-hosted, linux]
runs-on: [self-hosted, Linux]
container: lampepfl/dotty:2020-04-24
needs: [test, test_bootstrapped, community_build, test_sbt, test_java8]
if: github.event_name == 'schedule'
Expand Down Expand Up @@ -274,7 +301,7 @@ jobs:
./project/scripts/sbtPublish ";project dotty-bootstrapped ;publishSigned ;sonatypeBundleRelease"

nightly_documentation:
runs-on: [self-hosted, linux]
runs-on: [self-hosted, Linux]
container: lampepfl/dotty:2020-04-24
needs: [publish_nightly]
if: github.event_name == 'schedule'
Expand Down Expand Up @@ -328,7 +355,7 @@ jobs:
publish_branch: gh-pages

publish_release:
runs-on: [self-hosted, linux]
runs-on: [self-hosted, Linux]
container: lampepfl/dotty:2020-04-24
needs: [test, test_bootstrapped, community_build, test_sbt, test_java8]
if: github.event_name == 'push' &&
Expand Down Expand Up @@ -423,7 +450,7 @@ jobs:
asset_content_type: text/plain

release_documentation:
runs-on: [self-hosted, linux]
runs-on: [self-hosted, Linux]
container: lampepfl/dotty:2020-04-24
needs: [publish_release]
if: github.event_name == 'push' &&
Expand Down Expand Up @@ -480,7 +507,7 @@ jobs:
publish_branch: gh-pages

publish_sbt_release:
runs-on: [self-hosted, linux]
runs-on: [self-hosted, Linux]
container: lampepfl/dotty:2020-04-24
needs: [test, test_bootstrapped, community_build, test_sbt, test_java8]
if: github.event_name == 'push' &&
Expand Down
4 changes: 3 additions & 1 deletion .jvmopts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
-Xss1m
-Xms512m
-Xmx1200m
-Xmx4096m
-XX:MaxInlineLevel=35
-XX:ReservedCodeCacheSize=512m
-XX:MaxMetaspaceSize=1024m
6 changes: 3 additions & 3 deletions compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting {

// Positive tests ------------------------------------------------------------

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

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

@Test def picklingWithCompiler: Unit = {
@Test def picklingWithCompiler: Unit = if (!scala.util.Properties.isWin) {
val jvmBackendFilter = FileFilter.exclude(List("BTypes.scala", "Primitives.scala")) // TODO
implicit val testGroup: TestGroup = TestGroup("testPicklingWithCompiler")
aggregateTests(
Expand Down
9 changes: 4 additions & 5 deletions compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class VulpixUnitTests extends ParallelTesting {
// To fail with something else than an AssertionError
def fail(): Unit = throw new Exception("didn't fail properly")

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

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

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

@Test def badJava: Unit =
@Test def badJava: Unit = if (!scala.util.Properties.isWin)
try {
compileFile("tests/vulpix-tests/unit/BadJava.java", defaultOptions).suppressAllOutput.checkCompile()
fail()
Expand Down
1 change: 0 additions & 1 deletion project/scripts/sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ CMD="${1:?Missing sbt command}"
sbt -J-Xmx4096m \
-J-XX:ReservedCodeCacheSize=512m \
-J-XX:MaxMetaspaceSize=1024m \
-Ddotty.drone.mem=4096m \
-DSBT_PGP_USE_GPG=false \
-no-colors \
"$CMD"