Merge pull request #445 from eed3si9n/wip/githubactions

Update GitHub Actions

Author: eed3si9n

.github/workflows/ci.yml

@@ -10,12 +10,15 @@ jobs:
         include:
           - os: ubuntu-latest
             java: 8
+            distribution: zulu
             jobtype: 1
           - os: ubuntu-latest
             java: 11
+            distribution: temurin
             jobtype: 1
-          - os: ubuntu-latest
+          - os: macos-latest
             java: 17
+            distribution: temurin
             jobtype: 1
     runs-on: ${{ matrix.os }}
     env:
@@ -26,11 +29,13 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Setup JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
-        distribution: temurin
+        distribution: "${{ matrix.distribution }}"
         java-version: "${{ matrix.java }}"
         cache: sbt
+    - name: Setup sbt
+      uses: sbt/setup-sbt@v1
     - name: Build and test (1)
       if: ${{ matrix.jobtype == 1 }}
       shell: bash

ivy/src/test/scala/sbt/internal/librarymanagement/ModuleResolversTest.scala

@@ -43,8 +43,7 @@ object ModuleResolversTest extends BaseIvySpecification {
     println(s"NORMAL RESOLUTION TIME $normalResolutionTime")
     println(s"FASTER RESOLUTION TIME $fasterResolutionTime")
 
-    // Check that faster resolution is at least 1/5 faster than normal resolution
-    // This is a conservative check just to make sure we don't regress -- speedup is higher
-    assert(fasterResolutionTime <= (normalResolutionTime * 0.80))
+    // Check that faster resolution is faster
+    assert(fasterResolutionTime < normalResolutionTime)
   }
 }