From cb4558fd1d2a8c4b0f46be19e9d0612d84d6a311 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 1 Jun 2026 03:34:05 -0400 Subject: [PATCH] wip --- .github/workflows/ci.yml | 96 +++++++++---------- .../sbt/internal/util/HashBenchmark.scala | 2 +- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28e333964..33b57306e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,54 +12,54 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-22.04 - java: 21 - distribution: temurin - jobtype: 1 - - os: ubuntu-latest - java: 17 - distribution: zulu - jobtype: 2 - - os: ubuntu-latest - java: 25 - distribution: zulu - jobtype: 3 - - os: ubuntu-latest - java: 25 - distribution: zulu - jobtype: 4 - - os: ubuntu-latest - java: 25 - distribution: zulu - jobtype: 5 + # - os: ubuntu-22.04 + # java: 21 + # distribution: temurin + # jobtype: 1 # - os: ubuntu-latest - # java: 8 + # java: 17 # distribution: zulu - # jobtype: 6 - - os: ubuntu-latest - java: 25 - distribution: zulu - jobtype: 7 - - os: ubuntu-latest - java: 17 - distribution: temurin - jobtype: 10 - - os: ubuntu-latest - java: 17 - distribution: temurin - jobtype: 11 - - os: windows-latest - java: 17 - distribution: temurin - jobtype: 10 - - os: windows-latest - java: 17 - distribution: zulu - jobtype: 12 + # jobtype: 2 + # - os: ubuntu-latest + # java: 25 + # distribution: zulu + # jobtype: 3 + # - os: ubuntu-latest + # java: 25 + # distribution: zulu + # jobtype: 4 + # - os: ubuntu-latest + # java: 25 + # distribution: zulu + # jobtype: 5 + # # - os: ubuntu-latest + # # java: 8 + # # distribution: zulu + # # jobtype: 6 + # - os: ubuntu-latest + # java: 25 + # distribution: zulu + # jobtype: 7 # - os: ubuntu-latest # java: 17 # distribution: temurin - # jobtype: 13 + # jobtype: 10 + # - os: ubuntu-latest + # java: 17 + # distribution: temurin + # jobtype: 11 + # - os: windows-latest + # java: 17 + # distribution: temurin + # jobtype: 10 + # - os: windows-latest + # java: 17 + # distribution: zulu + # jobtype: 12 + - os: ubuntu-latest + java: 17 + distribution: temurin + jobtype: 13 runs-on: ${{ matrix.os }} timeout-minutes: 25 env: @@ -207,8 +207,8 @@ jobs: shell: bash run: | ./sbt -v "scripted cache/*" - # - name: Hash Benchmark - # if: ${{ matrix.jobtype == 13 }} - # shell: bash - # run: | - # ./sbt -v "hashBenchmark/Jmh/run -i 5 -wi 3 -f1 -t1" + - name: Hash Benchmark + if: ${{ matrix.jobtype == 13 }} + shell: bash + run: | + ./sbt -v "hashBenchmark/Jmh/run -i 5 -wi 3 -f1 -t1" diff --git a/internal/hash-benchmark/src/main/scala/sbt/internal/util/HashBenchmark.scala b/internal/hash-benchmark/src/main/scala/sbt/internal/util/HashBenchmark.scala index b60847f8f..a2b4896d9 100644 --- a/internal/hash-benchmark/src/main/scala/sbt/internal/util/HashBenchmark.scala +++ b/internal/hash-benchmark/src/main/scala/sbt/internal/util/HashBenchmark.scala @@ -39,7 +39,7 @@ class FarmHashHashBenchmark extends AbstractHashBenchmark: val hash = LongHashFunction.farmNa().hashBytes(buf) java.lang.Long.toHexString(hash) -class FarmHash64VarHandleHashBenchmark extends AbstractHashBenchmark: +class FarmHash64HashSbtBenchmark extends AbstractHashBenchmark: override def hash(buf: Array[Byte]): String = val h = Hashing.farmNaHash64 val hash = h.hash(buf, 0, buf.size)