Merge pull request #61 from alexarchambault/merge-upstream

Merge upstream changes

Author: alexarchambault

.github/workflows/ci.yml

@@ -14,21 +14,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
       - uses: coursier/[email protected]
         with:
           jvm: "graalvm-java17:21.3.0"
       - name: Check formatting
         run: ./bin/scalafmt --test
-  test:
+  bridges:
+    name: Test platform bridges
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        jdk: ["graalvm-java17:21.3.0", "temurin:17"]
-    name: Test ${{ matrix.os }} -- ${{ matrix.jdk }}
-    env:
-      HYDRA_LICENSE: ${{ secrets.HYDRA_LICENSE }}
+        jdk: ["graalvm-java17:21.3.0"]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -37,36 +38,47 @@ jobs:
       - uses: coursier/[email protected]
         with:
           jvm: ${{ matrix.jdk }}
-      - name: Set up environment
-        run: |
-          curl -Lo coursier https://git.io/coursier-cli && chmod +x coursier && ./coursier --help
-          yarn --help
-          java -version
-          [[ $HYDRA_LICENSE == floating-key=* ]] && mkdir -p $HOME/.triplequote && echo "$HYDRA_LICENSE" > "$HOME/.triplequote/hydra.license" || echo "Hydra license file was not created"
-        shell: bash
-      - name: Compile and test main projects
+      - name: Tests
         run: |
           .github/setup-test-projects.sh &&\
           ./bin/sbt-ci.sh \
-              "frontend/test:compile" \
-              "backend/test" \
               "jsBridge06/publishLocal" \
               "jsBridge1/publishLocal" \
-              "frontend/testOnly bloop.ScalaVersionsSpec" \
-              "frontend/testOnly -bloop.ScalaVersionsSpec" \
               "jsBridge06/test" \
-              "jsBridge1/test" &&\
-          ./bin/sbt-ci.sh \
-            "+test:compile"
+              "jsBridge1/test"
         shell: bash
-  launcher-test:
+
+  launcher:
+    name: Launcher tests
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
         jdk: ["graalvm-java17:21.3.0"]
-    name: Launcher tests ${{ matrix.os }} -- ${{ matrix.jdk }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+      - uses: coursier/[email protected]
+        with:
+          jvm: ${{ matrix.jdk }}
+      - name: Tests
+        run: |
+          echo $JAVA_HOME
+          which gu && gu install native-image
+          ./bin/sbt-ci.sh publishLocal "launcherTest/test"
+        shell: bash
+
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        jdk: ["graalvm-java17:21.3.0", "temurin:17"]
+    name: Test ${{ matrix.os }} -- ${{ matrix.jdk }}
     env:
       HYDRA_LICENSE: ${{ secrets.HYDRA_LICENSE }}
     steps:
@@ -84,19 +96,16 @@ jobs:
           java -version
           [[ $HYDRA_LICENSE == floating-key=* ]] && mkdir -p $HOME/.triplequote && echo "$HYDRA_LICENSE" > "$HOME/.triplequote/hydra.license" || echo "Hydra license file was not created"
         shell: bash
-      - name: Prepare launcher tests
-        run: |
-          echo $JAVA_HOME
-          which gu && gu install native-image
-          ./bin/sbt-ci.sh publishLocal
-        shell: bash
-      - name: Prepare launcher tests
-        if: matrix.os != 'windows-latest'
-        run: |
-          ./bin/sbt-ci.sh bloopgun/graalvm-native-image:packageBin
-      - name: Run launcher tests
+      - name: Compile and test main projects
         run: |
-          ./bin/sbt-ci.sh "launcherTest/test"
+          .github/setup-test-projects.sh &&\
+          ./bin/sbt-ci.sh \
+              "frontend/test:compile" \
+              "backend/test" \
+              "frontend/testOnly bloop.ScalaVersionsSpec" \
+              "frontend/testOnly -bloop.ScalaVersionsSpec" &&\
+          ./bin/sbt-ci.sh \
+            "+test:compile"
         shell: bash
 
   publish-binaries:
@@ -164,7 +173,7 @@ jobs:
         uses: al-cheb/[email protected]
       - name: Refresh Pagefile
         run: |
-              (Get-CimInstance Win32_PageFileUsage).AllocatedBaseSize
+          (Get-CimInstance Win32_PageFileUsage).AllocatedBaseSize
       - uses: actions/checkout@v3
         with:
           submodules: true
@@ -202,7 +211,6 @@ jobs:
           name: bloop-artifacts
           path: bloop-artifacts/${{ matrix.artifact }}
 
-
   release:
     name: Release version on ${{ matrix.os }}
     needs:

frontend/src/test/scala/bloop/DeduplicationSpec.scala

@@ -180,7 +180,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
   }
 
   test("deduplication removes invalidated class files from all external classes dirs") {
-    val attempts = if (System.getenv("CI") != null && Properties.isWin) 3 else 1
+    val attempts = if (System.getenv("CI") != null) 3 else 1
     TestUtil.retry(attempts) {
       deduplicationInvalidatedClassFilesRemovalTest()
     }