-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'series/2.x' into update/auxlib-0.5.5
- Loading branch information
Showing
8 changed files
with
39 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
name: CI | ||
|
||
env: | ||
JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -XX:MaxMetaspaceSize=4G -Xmx4G -Xss8M # JDK_JAVA_OPTIONS is _the_ env. variable to use for modern Java | ||
JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -Xms6G -Xmx6G # JDK_JAVA_OPTIONS is _the_ env. variable to use for modern Java | ||
SBT_OPTS: -XX:+PrintCommandLineFlags -Xms6G -Xmx6G # Needed for sbt | ||
NODE_OPTIONS: --max_old_space_size=6144 | ||
|
||
on: | ||
|
@@ -22,15 +23,13 @@ jobs: | |
with: | ||
fetch-depth: 0 | ||
- name: Setup Java | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
distribution: temurin | ||
java-version: 17 | ||
check-latest: true | ||
- name: Cache scala dependencies | ||
uses: coursier/cache-action@v6 | ||
- name: Install libuv | ||
run: sudo apt-get update && sudo apt-get install -y libuv1-dev | ||
- name: Set Swap Space | ||
uses: pierotofy/set-swap-space@master | ||
with: | ||
|
@@ -50,15 +49,13 @@ jobs: | |
- name: Checkout current branch | ||
uses: actions/[email protected] | ||
- name: Setup Java | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
distribution: temurin | ||
java-version: 17 | ||
check-latest: true | ||
- name: Cache scala dependencies | ||
uses: coursier/cache-action@v6 | ||
- name: Install libuv | ||
run: sudo apt-get update && sudo apt-get install -y libuv1-dev | ||
- name: Set Swap Space | ||
uses: pierotofy/set-swap-space@master | ||
with: | ||
|
@@ -73,7 +70,7 @@ jobs: | |
- name: Checkout current branch | ||
uses: actions/[email protected] | ||
- name: Setup Java | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
distribution: temurin | ||
java-version: 11 # ensure it works on 11 because we publish for 11 | ||
|
@@ -85,8 +82,6 @@ jobs: | |
registry-url: https://registry.npmjs.org | ||
- name: Cache scala dependencies | ||
uses: coursier/cache-action@v6 | ||
- name: Install libuv | ||
run: sudo apt-get update && sudo apt-get install -y libuv1-dev | ||
- name: Set Swap Space | ||
uses: pierotofy/set-swap-space@master | ||
with: | ||
|
@@ -111,15 +106,13 @@ jobs: | |
with: | ||
fetch-depth: 0 | ||
- name: Setup Java | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
distribution: temurin | ||
java-version: ${{ matrix.java }} | ||
check-latest: true | ||
- name: Cache scala dependencies | ||
uses: coursier/cache-action@v6 | ||
- name: Install libuv | ||
run: sudo apt-get update && sudo apt-get install -y libuv1-dev | ||
- name: Set Swap Space | ||
uses: pierotofy/set-swap-space@master | ||
with: | ||
|
@@ -146,15 +139,13 @@ jobs: | |
- name: Checkout current branch | ||
uses: actions/[email protected] | ||
- name: Setup Java | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
distribution: temurin | ||
java-version: ${{ matrix.java }} | ||
check-latest: true | ||
- name: Cache scala dependencies | ||
uses: coursier/cache-action@v6 | ||
- name: Install libuv | ||
run: sudo apt-get update && sudo apt-get install -y libuv1-dev | ||
- name: Set Swap Space | ||
uses: pierotofy/set-swap-space@master | ||
with: | ||
|
@@ -174,21 +165,19 @@ jobs: | |
- name: Checkout current branch | ||
uses: actions/[email protected] | ||
- name: Setup Java | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
distribution: temurin | ||
java-version: ${{ matrix.java }} | ||
check-latest: true | ||
- name: Cache scala dependencies | ||
uses: coursier/cache-action@v6 | ||
- name: Install libuv | ||
run: sudo apt-get update && sudo apt-get install -y libuv1-dev | ||
- name: Set Swap Space | ||
uses: pierotofy/set-swap-space@master | ||
with: | ||
swap-size-gb: 7 | ||
- name: Test on different Scala target platforms | ||
run: ./sbt root${{ matrix.platform }}/test | ||
run: ./sbt test${{ matrix.platform }} | ||
|
||
update-readme: | ||
name: Update README | ||
|
@@ -200,10 +189,8 @@ jobs: | |
uses: actions/[email protected] | ||
with: | ||
fetch-depth: '0' | ||
- name: Install libuv | ||
run: sudo apt-get update && sudo apt-get install -y libuv1-dev | ||
- name: Setup Scala | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
distribution: temurin | ||
java-version: '17' | ||
|
@@ -272,15 +259,13 @@ jobs: | |
with: | ||
fetch-depth: 0 | ||
- name: Setup Java | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
distribution: temurin | ||
java-version: 11 # publish for 11 | ||
check-latest: true | ||
- name: Cache scala dependencies | ||
uses: coursier/cache-action@v6 | ||
- name: Install libuv | ||
run: sudo apt-get update && sudo apt-get install -y libuv1-dev | ||
- name: Set Swap Space | ||
uses: pierotofy/set-swap-space@master | ||
with: | ||
|
@@ -305,10 +290,8 @@ jobs: | |
uses: actions/[email protected] | ||
with: | ||
fetch-depth: '0' | ||
- name: Install libuv | ||
run: sudo apt-get update && sudo apt-get install -y libuv1-dev | ||
- name: Setup Scala | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
distribution: temurin | ||
java-version: '11' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
-J-Xmx4G | ||
-J-Xms512M | ||
-J-Xss4M | ||
-J-XX:+UseG1GC |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
core-tests/shared/src/test/scala/zio/prelude/ZIOBaseSpec.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
package zio.prelude | ||
|
||
import zio._ | ||
import zio.test.TestAspect._ | ||
import zio.test._ | ||
|
||
trait ZIOBaseSpec extends ZIOSpecDefault { | ||
override def aspects: Chunk[TestAspectAtLeastR[Environment with TestEnvironment]] = | ||
if (TestPlatform.isJVM) Chunk(TestAspect.timeout(60.seconds), TestAspect.timed) | ||
else Chunk(TestAspect.timeout(60.seconds), TestAspect.sequential, TestAspect.timed) | ||
else if (TestPlatform.isNative) Chunk(TestAspect.timeout(300.seconds), TestAspect.timed, size(10)) | ||
else Chunk(TestAspect.timeout(300.seconds), TestAspect.sequential, TestAspect.timed, size(10)) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
experimental-tests/shared/src/test/scala/zio/prelude/experimental/ZIOBaseSpec.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
package zio.prelude.experimental | ||
|
||
import zio._ | ||
import zio.test.TestAspect._ | ||
import zio.test._ | ||
|
||
trait ZIOBaseSpec extends ZIOSpecDefault { | ||
override def aspects: Chunk[TestAspectAtLeastR[Environment with TestEnvironment]] = | ||
if (TestPlatform.isJVM) Chunk(TestAspect.timeout(60.seconds), TestAspect.timed) | ||
else Chunk(TestAspect.timeout(300.seconds), TestAspect.sequential, TestAspect.timed) | ||
else if (TestPlatform.isNative) Chunk(TestAspect.timeout(300.seconds), TestAspect.timed, size(10)) | ||
else Chunk(TestAspect.timeout(300.seconds), TestAspect.sequential, TestAspect.timed, size(10)) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters