From 22f1b76428d1da0fd3502ef76e5d9fb074784d0e Mon Sep 17 00:00:00 2001 From: Ara Adkins Date: Fri, 2 Oct 2020 11:25:48 +0100 Subject: [PATCH] Bump the Node LTS patch version (#1182) --- .github/workflows/docs.yml | 2 +- .github/workflows/release.yml | 9 +++++++- .github/workflows/rust.yml | 2 +- .github/workflows/scala.yml | 21 ++++++++++++++++++- docs/CONTRIBUTING.md | 2 +- .../scala/org/enso/launcher/NativeTest.scala | 4 ++-- .../launcher/locking/TestSynchronizer.scala | 2 +- .../enso/launcher/upgrade/UpgradeSpec.scala | 3 ++- 8 files changed, 36 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 5487cb0e3e8..d24da1319af 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,7 +7,7 @@ on: branches: ["*"] env: - nodeVersion: 12.18.0 + nodeVersion: 12.18.4 jobs: check: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab16f15e697..f9734b8f552 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -90,6 +90,13 @@ jobs: ~/.cache key: ${{ runner.os }}-sbt-${{ hashFiles('**build.sbt') }} restore-keys: ${{ runner.os }}-sbt- + - name: Cache Local Maven Repository + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- # Build Artifacts - name: Enable Release Mode @@ -192,7 +199,7 @@ jobs: shell: bash run: | cd std-bits - mvn package + mvn --no-transfer-progress package # The way artifacts are uploaded currently does not preserve the # executable bits for Unix. However putting artifacts into a ZIP would diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 9f46379e2f8..df45c81aad8 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -8,7 +8,7 @@ on: env: wasmpackVersion: 0.8.1 - nodeVersion: 12.18.0 + nodeVersion: 12.18.4 rustToolchain: nightly-2019-11-04 jobs: diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 8b33ca843bf..cae7cd885b4 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -99,6 +99,13 @@ jobs: ~/.cache key: ${{ runner.os }}-sbt-${{ hashFiles('**build.sbt') }} restore-keys: ${{ runner.os }}-sbt- + - name: Cache Local Maven Repository + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- # Build - name: Bootstrap Enso project @@ -116,6 +123,11 @@ jobs: run: | echo '::set-env name=CI_TEST_TIMEFACTOR::2' echo '::set-env name=CI_TEST_FLAKY_ENABLE::true' + - name: Prebuild Base Java Extensions + shell: bash + run: | + cd std-bits + mvn --no-transfer-progress package - name: Build the Launcher run: | sleep 1 @@ -228,6 +240,13 @@ jobs: ~/.cache key: ${{ runner.os }}-sbt-${{ hashFiles('**build.sbt') }} restore-keys: ${{ runner.os }}-sbt- + - name: Cache Local Maven Repository + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- # Build Artifacts - name: Bootstrap the Project @@ -324,7 +343,7 @@ jobs: shell: bash run: | cd std-bits - mvn package + mvn --no-transfer-progress package # The way artifacts are uploaded currently does not preserve the # executable bits for Unix. However putting artifacts into a ZIP would diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 07f3e4bb569..6adafb3e2d8 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -204,7 +204,7 @@ rustup component add clippy You will also need `node` in order to run the `wasm` tests. We only support the latest LTS version of [NodeJS](https://nodejs.org/en/download) and NPM. We recommend using [`nvm`](https://github.com/nvm-sh/nvm) to manage node versions. -The current LTS is `v12.18.3`. +The current LTS is `v12.18.4`. ### Getting Set Up (JVM) diff --git a/engine/launcher/src/test/scala/org/enso/launcher/NativeTest.scala b/engine/launcher/src/test/scala/org/enso/launcher/NativeTest.scala index eac21c90d74..0cfd7dab099 100644 --- a/engine/launcher/src/test/scala/org/enso/launcher/NativeTest.scala +++ b/engine/launcher/src/test/scala/org/enso/launcher/NativeTest.scala @@ -22,7 +22,7 @@ import scala.jdk.StreamConverters._ */ trait NativeTest extends AnyWordSpec with Matchers with TimeLimitedTests { - override val timeLimit: Span = 30 seconds + override val timeLimit: Span = 60.seconds override val defaultTestSignaler: Signaler = _.interrupt() /** @@ -242,7 +242,7 @@ trait NativeTest extends AnyWordSpec with Matchers with TimeLimitedTests { */ def waitForMessageOnErrorStream( message: String, - timeoutSeconds: Long = 10 + timeoutSeconds: Long ): Unit = { val semaphore = new Semaphore(0) def handler(line: String, streamType: StreamType): Unit = { diff --git a/engine/launcher/src/test/scala/org/enso/launcher/locking/TestSynchronizer.scala b/engine/launcher/src/test/scala/org/enso/launcher/locking/TestSynchronizer.scala index b3c64c8e114..8befe426afc 100644 --- a/engine/launcher/src/test/scala/org/enso/launcher/locking/TestSynchronizer.scala +++ b/engine/launcher/src/test/scala/org/enso/launcher/locking/TestSynchronizer.scala @@ -78,7 +78,7 @@ class TestSynchronizer { /** * Timeout used by [[waitFor]]. */ - val timeOutSeconds: Long = 10 + val timeOutSeconds: Long = 20 /** * Reports that the event has happened now. diff --git a/engine/launcher/src/test/scala/org/enso/launcher/upgrade/UpgradeSpec.scala b/engine/launcher/src/test/scala/org/enso/launcher/upgrade/UpgradeSpec.scala index b6aee54a37a..2ec5879673c 100644 --- a/engine/launcher/src/test/scala/org/enso/launcher/upgrade/UpgradeSpec.scala +++ b/engine/launcher/src/test/scala/org/enso/launcher/upgrade/UpgradeSpec.scala @@ -331,7 +331,8 @@ class UpgradeSpec ) try { firstSuspended.waitForMessageOnErrorStream( - "INTERNAL-TEST-ACQUIRING-LOCK" + "INTERNAL-TEST-ACQUIRING-LOCK", + timeoutSeconds = 30 ) val secondFailed = run(Seq("upgrade", "0.0.0"))