Merge pull request #142 from alexarchambault/tweak-ci

Tweak CI

Author: alexarchambault

.github/scripts/update-website.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -e
+
+git config --global user.name "gh-actions"
+git config --global user.email "[email protected]"
+
+cd website
+yarn install
+yarn build
+yarn deploy

.github/workflows/ci.yml

@@ -10,6 +10,7 @@ on:
 
 jobs:
   jvm-tests:
+    timeout-minutes: 80
     runs-on: ${{ matrix.OS }}
     strategy:
       fail-fast: false
@@ -41,6 +42,7 @@ jobs:
       run: ./mill -i integration.jvm.test
 
   native-tests:
+    timeout-minutes: 80
     runs-on: ${{ matrix.OS }}
     strategy:
       fail-fast: false
@@ -74,6 +76,7 @@ jobs:
         COURSIER_JNI: force
 
   native-mostly-static-tests:
+    timeout-minutes: 80
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -114,6 +117,7 @@ jobs:
         docker push ghcr.io/virtuslabrnd/scala-cli:latest
 
   native-static-tests:
+    timeout-minutes: 80
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -138,6 +142,7 @@ jobs:
       run: ./mill -i integration.native-static.test
 
   checks:
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -154,6 +159,7 @@ jobs:
       run: ./mill -i 'dummy.amm[_].resolvedRunIvyDeps.'
 
   format:
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -168,6 +174,7 @@ jobs:
     - run: scalafmt --check
 
   reference-doc:
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -188,6 +195,7 @@ jobs:
         )
 
   vc-redist:
+    timeout-minutes: 15
     runs-on: windows-2016
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'VirtuslabRnD/scala-cli'
     steps:
@@ -231,6 +239,7 @@ jobs:
         SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
 
   launchers:
+    timeout-minutes: 20
     needs: [jvm-tests, native-tests, native-mostly-static-tests, native-static-tests, vc-redist, format, checks, reference-doc]
     if: github.event_name == 'push'
     runs-on: ubuntu-latest
@@ -289,9 +298,28 @@ jobs:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           GPG_EMAIL: ${{ secrets.GPG_EMAIL }}
 
-  website:
+  website-nightly:
+    needs: publish
+    if: github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        submodules: true
+    - uses: actions/[email protected]
+      with:
+        node-version: '12.x'
+    - run: .github/scripts/update-website.sh
+      env:
+        GIT_USER: VirtuslabRnD
+        DEPLOYMENT_BRANCH: gh-pages
+        GIT_PASS: ${{ secrets.GITHUB_TOKEN }}
+
+  # same as website-nightly above, but for the 'needs' and 'if' fields
+  website-release:
     needs: [publish, update-packages]
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -301,13 +329,7 @@ jobs:
     - uses: actions/[email protected]
       with:
         node-version: '12.x'
-    - run: |
-        git config --global user.name "gh-actions"
-        git config --global user.email "[email protected]"
-        cd website
-        yarn install
-        yarn build
-        yarn deploy
+    - run: .github/scripts/update-website.sh
       env:
         GIT_USER: VirtuslabRnD
         DEPLOYMENT_BRANCH: gh-pages

modules/bloop-rifle/src/main/scala/scala/build/blooprifle/internal/Operations.scala

@@ -134,6 +134,11 @@ object Operations {
     promise.future
   }
 
+  private val ignoredErrnos = Set(
+    61, // Connection refused
+    111 //
+  )
+
   /** Opens a BSP connection to a running bloop server.
     *
     * Starts a thread to read output from the nailgun connection, and another one to pass input to
@@ -232,10 +237,10 @@ object Operations {
                 catch {
                   case ex: IOException
                       if ex.getCause.isInstanceOf[NativeErrorException] &&
-                        ex.getCause.asInstanceOf[NativeErrorException].returnCode == 111 =>
+                        ignoredErrnos(ex.getCause.asInstanceOf[NativeErrorException].returnCode) =>
                     logger.debug(s"Error when connecting to $socketFile: ${ex.getMessage}")
                     null
-                  case e: NativeErrorException if e.returnCode == 111 =>
+                  case e: NativeErrorException if ignoredErrnos(e.returnCode) =>
                     logger.debug(s"Error when connecting to $socketFile: ${e.getMessage}")
                     null
                 }

modules/integration/src/test/scala/scala/cli/integration/BspTestDefinitions.scala

@@ -8,14 +8,15 @@ import java.nio.charset.Charset
 import java.nio.file.Paths
 import java.util.concurrent.TimeoutException
 
+import scala.annotation.tailrec
 import scala.async.Async.{async, await}
 import scala.collection.JavaConverters._
 import scala.concurrent.{Await, Future, Promise}
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
 import scala.io.Codec
 import scala.util.control.NonFatal
-import scala.util.Properties
+import scala.util.{Failure, Properties, Success, Try}
 
 abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
     extends munit.FunSuite with TestScalaVersionArgs {
@@ -58,38 +59,61 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
   }
 
   def withBsp[T](
-    root: os.Path,
-    args: Seq[String]
+    inputs: TestInputs,
+    args: Seq[String],
+    attempts: Int = 3
   )(
-    f: (TestBspClient, b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer) => Future[T]
+    f: (
+      os.Path,
+      TestBspClient,
+      b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer
+    ) => Future[T]
   ): T = {
 
-    val proc = os.proc(TestUtil.cli, "bsp", extraOptions, args)
-      .spawn(cwd = root)
-    var remoteServer: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer = null
-
-    try {
-      val (localClient, remoteServer0, shutdownFuture) =
-        TestBspClient.connect(proc.stdout, proc.stdin, pool)
-      remoteServer = remoteServer0
-      val f0 = async {
-        await(remoteServer.buildInitialize(initParams(root)).asScala)
-        await(f(localClient, remoteServer))
+    def attempt(): Try[T] = Try {
+      val root = inputs.root()
+
+      val proc = os.proc(TestUtil.cli, "bsp", extraOptions, args)
+        .spawn(cwd = root)
+      var remoteServer: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer = null
+
+      try {
+        val (localClient, remoteServer0, shutdownFuture) =
+          TestBspClient.connect(proc.stdout, proc.stdin, pool)
+        remoteServer = remoteServer0
+        Await.result(remoteServer.buildInitialize(initParams(root)).asScala, 3.minutes)
+        Await.result(f(root, localClient, remoteServer), 3.minutes)
+      }
+      finally {
+        if (remoteServer != null)
+          try Await.result(remoteServer.buildShutdown().asScala, 20.seconds)
+          catch {
+            case NonFatal(e) =>
+              System.err.println(s"Ignoring $e while shutting down BSP server")
+          }
+        proc.join(2.seconds.toMillis)
+        proc.destroy()
+        proc.join(2.seconds.toMillis)
+        proc.destroyForcibly()
       }
-      Await.result(f0, 3.minutes)
     }
-    finally {
-      if (remoteServer != null)
-        try Await.result(remoteServer.buildShutdown().asScala, 20.seconds)
-        catch {
-          case NonFatal(e) =>
-            System.err.println(s"Ignoring $e while shutting down BSP server")
+
+    @tailrec
+    def helper(count: Int): T =
+      if (count <= 1)
+        attempt() match {
+          case Success(t)  => t
+          case Failure(ex) => throw new Exception(ex)
         }
-      proc.join(2.seconds.toMillis)
-      proc.destroy()
-      proc.join(2.seconds.toMillis)
-      proc.destroyForcibly()
-    }
+      else
+        attempt() match {
+          case Success(t) => t
+          case Failure(ex) =>
+            System.err.println(s"Caught $ex, trying again…")
+            helper(count - 1)
+        }
+
+    helper(attempts)
   }
 
   def checkTargetUri(root: os.Path, uri: String): Unit = {
@@ -135,9 +159,8 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
              |""".stripMargin
       )
     )
-    val root = inputs.root()
 
-    withBsp(root, Seq(".")) { (localClient, remoteServer) =>
+    withBsp(inputs, Seq(".")) { (root, localClient, remoteServer) =>
       async {
         val buildTargetsResp = await(remoteServer.workspaceBuildTargets().asScala)
         val target = {
@@ -263,9 +286,8 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
              |""".stripMargin
       )
     )
-    val root = inputs.root()
 
-    withBsp(root, Seq(".")) { (localClient, remoteServer) =>
+    withBsp(inputs, Seq(".")) { (root, localClient, remoteServer) =>
       async {
         val buildTargetsResp = await(remoteServer.workspaceBuildTargets().asScala)
         val target = {
@@ -331,9 +353,8 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
              |""".stripMargin
       )
     )
-    val root = inputs.root()
 
-    withBsp(root, Seq(".")) { (localClient, remoteServer) =>
+    withBsp(inputs, Seq(".")) { (root, localClient, remoteServer) =>
       async {
         val buildTargetsResp = await(remoteServer.workspaceBuildTargets().asScala)
         val target = {
@@ -400,12 +421,11 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
              |""".stripMargin
       )
     )
-    val root = inputs.root()
-
     val extraArgs =
       if (Properties.isWin) Seq("-v", "-v", "-v")
       else Nil
-    withBsp(root, Seq(".") ++ extraArgs) { (localClient, remoteServer) =>
+
+    withBsp(inputs, Seq(".") ++ extraArgs) { (root, localClient, remoteServer) =>
       async {
         val buildTargetsResp = await(remoteServer.workspaceBuildTargets().asScala)
         val target = {
@@ -518,9 +538,8 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
              |""".stripMargin
       )
     )
-    val root = inputs.root()
 
-    withBsp(root, Seq(".")) { (localClient, remoteServer) =>
+    withBsp(inputs, Seq(".")) { (root, localClient, remoteServer) =>
       async {
         val buildTargetsResp = await(remoteServer.workspaceBuildTargets().asScala)
         val target = {