From b3a83c2a1526364bf154e9da9322e844be0acc94 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 6 Sep 2024 01:18:32 -0400 Subject: [PATCH 1/2] Avoid using ZipError --- .../src/main/java/sbt/internal/inc/zip/ZipCentralDir.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/zinc-classfile/src/main/java/sbt/internal/inc/zip/ZipCentralDir.java b/internal/zinc-classfile/src/main/java/sbt/internal/inc/zip/ZipCentralDir.java index 20fe9e1c9..c0ca6d8aa 100644 --- a/internal/zinc-classfile/src/main/java/sbt/internal/inc/zip/ZipCentralDir.java +++ b/internal/zinc-classfile/src/main/java/sbt/internal/inc/zip/ZipCentralDir.java @@ -302,8 +302,8 @@ public int hashCode() { IndexNode child; // 1st child } - private static void zerror(String msg) { - throw new ZipError(msg); + private static void zerror(String msg) throws ZipException { + throw new ZipException(msg); } private void buildNodeTree() { From ac211dcae45c6e52973c5c524c6e0fd180c8dbdc Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 6 Sep 2024 23:04:33 -0400 Subject: [PATCH 2/2] Fix build --- .github/workflows/ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3af480be..48653ce17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,20 +64,19 @@ jobs: shell: bash run: | sbt -v -Dfile.encoding=UTF-8 "-Dbenchmark.pattern=.*Shapeless.*" "runBenchmarks" - - name: Checkout Develop Branch (4, 5) + - name: Checkout 1.10.x Branch (4, 5) if: ${{ github.event_name == 'pull_request' && (matrix.jobtype == 4 || matrix.jobtype == 5) }} uses: actions/checkout@v4 with: clean: false - ref: develop - - name: Benchmark (Scalac) against Develop Branch (4) + ref: 1.10.x + - name: Benchmark (Scalac) against 1.10.x Branch (4) if: ${{ github.event_name == 'pull_request' && matrix.jobtype == 4 }} shell: bash run: | - sbt -v -Dfile.encoding=UTF-8 "-Dbenchmark.pattern=.*Scalac.*" "zincBenchmarks/jmh:clean" "runBenchmarks" - - name: Benchmark (Shapeless) against Develop Branch (5) + sbt -v -Dfile.encoding=UTF-8 "-Dbenchmark.pattern=.*Scalac.*" "zincBenchmarks/Jmh/clean" "runBenchmarks" + - name: Benchmark (Shapeless) against 1.10.x Branch (5) if: ${{ github.event_name == 'pull_request' && matrix.jobtype == 5 }} shell: bash run: | - sbt -v -Dfile.encoding=UTF-8 "-Dbenchmark.pattern=.*Shapeless.*" "zincBenchmarks/jmh:clean" "runBenchmarks" - + sbt -v -Dfile.encoding=UTF-8 "-Dbenchmark.pattern=.*Shapeless.*" "zincBenchmarks/Jmh/clean" "runBenchmarks"