Skip to content

Commit

Permalink
Merge pull request #157 from tgodzik/enable-windows
Browse files Browse the repository at this point in the history
Make sure windows tests are run
  • Loading branch information
tgodzik authored Jan 27, 2022
2 parents 10c9ab1 + c337ed4 commit 3238d74
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 7 deletions.
24 changes: 22 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,34 @@ jobs:
java: 8
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v13
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
# We need to set proper Pagefile limits in advance.
# Github actions default page file size is quite small,
# it's not enough to run all tests, especially when using None GC.
# We've observed that on Unix memory management is less strict,
# you can reserve more memory than it's physically possible.
# On Windows however you need to reserve/commit memory in advance -
# it does not matter whether it would be used or not, the amount of all
# reserved memory cannot exceed the amount of physically available storage.
- name: Configure Pagefile
if: matrix.os == 'windows-latest'
uses: al-cheb/[email protected]
with:
minimum-size: 4GB
maximum-size: 16GB
- name: Test
run: sbt +test
checks:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v13
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 8
- run: ./bin/scalafmt --check
- run: sbt scalafixCheckAll
- run: sbt coreJVM/mimaReportBinaryIssues
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: olafurpg/setup-scala@v13
- uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 8
- uses: olafurpg/setup-gpg@v3
- name: Publish ${{ github.ref }}
run: sbt ci-release docs/docusaurusPublishGhpages
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,15 @@ class SConfig2ClassSuite extends munit.FunSuite {
assertEquals(aPos, Position.None: Position)

val bPos = obtainedObj.field("b").get.pos
assertEquals(bPos.lineContent, "b = foo")
assertEquals(
bPos.lineContent.replace("\n", "").replace("\r", ""),
"b = foo"
)

val cPos = obtainedObj.field("c").get.pos
assertEquals(cPos.lineContent, "c = bar")
assertEquals(
cPos.lineContent.replace("\n", "").replace("\r", ""),
"c = bar"
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,15 @@ class TypesafeConfig2ClassSuite extends munit.FunSuite {
assertEquals(aPos, Position.None: Position)

val bPos = obtainedObj.field("b").get.pos
assertEquals(bPos.lineContent, "b = foo")
assertEquals(
bPos.lineContent.replace("\n", "").replace("\r", ""),
"b = foo"
)

val cPos = obtainedObj.field("c").get.pos
assertEquals(cPos.lineContent, "c = bar")
assertEquals(
cPos.lineContent.replace("\n", "").replace("\r", ""),
"c = bar"
)
}
}

0 comments on commit 3238d74

Please sign in to comment.