Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .githooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#
# Covered:
# * scalafmtCheckAll — formatting matches .scalafmt.conf across all modules
# * scalafmtSbtCheck — ditto for the build's *.sbt files (mirrors CI's
# 'Check formatting' step, which checks them separately)
# * benchmarks/scalafmtCheck — ditto for benchmarks/ (outside the root aggregate)
# * scalafixAll --check — scalafix rules in .scalafix.conf are clean
# * docs/mdoc — every `scala mdoc` fence in site/docs/*.md compiles
Expand All @@ -23,4 +25,4 @@ else
fi

echo "[pre-commit] running scalafmtCheckAll + benchmarks/scalafmtCheck + scalafixAll --check + docs/mdoc + docs/laikaSite ..."
sbt -no-colors 'scalafmtCheckAll; benchmarks/scalafmtCheck; benchmarks/Test/scalafmtCheck; scalafixAll --check; docs/mdoc; docs/laikaSite'
sbt -no-colors 'scalafmtCheckAll; scalafmtSbtCheck; benchmarks/scalafmtCheck; benchmarks/Test/scalafmtCheck; scalafixAll --check; docs/mdoc; docs/laikaSite'
8 changes: 7 additions & 1 deletion .github/bench/bench_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@
# new module without a mapping entry must never silently skip benchmarks.

MODULE_BENCHES = {
"avro/": ["AvroBytesBench", "AvroJsonBridgeBench", "AvroVulcanBench", "OrderAvroBench"],
"avro/": [
"AvroBytesBench",
"AvroJsonBridgeBench",
"AvroVulcanBench",
"OrderAvroBench",
"ClickRecordBench",
],
"circe/": ["JsoniterBench", "OpticBuildBench", "OrderCirceBench", "PlatedBench"],
"jsoniter/": [
"AvroJsonBridgeBench",
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/bench-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,16 @@ jobs:
with:
distribution: temurin
java-version: 25 # kyoIntegration (KyoDiBench dep) targets JDK 25 since v0.15.0
cache: sbt
- name: Cache coursier + ivy + sbt boot
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: |
${{ runner.os }}-sbt-

- name: Base run (${{ steps.plan.outputs.base }})
id: base
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/bench-sweep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,16 @@ jobs:
with:
distribution: temurin
java-version: 25 # kyoIntegration (KyoDiBench dep) targets JDK 25 since v0.15.0
cache: sbt
- name: Cache coursier + ivy + sbt boot
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: |
${{ runner.os }}-sbt-

- name: Run full JMH sweep
if: steps.ctx.outputs.skip == 'false'
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,16 @@ jobs:
with:
distribution: temurin
java-version: 21
cache: sbt
- name: Cache coursier + ivy + sbt boot
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: |
${{ runner.os }}-sbt-

- name: Run JMH
# `inputs.*` are only populated for workflow_dispatch; the `|| 'default'`
Expand Down
180 changes: 156 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,21 @@ jobs:
with:
distribution: temurin
java-version: 25
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-25
if: matrix.java == 'temurin@25'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@25' && steps.setup-java-temurin-25.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@25' && steps.coursier-cache-temurin-25.outputs.cache-hit != 'true'
run: sbt +update

- name: Setup Java (temurin@17)
Expand All @@ -61,10 +72,21 @@ jobs:
with:
distribution: temurin
java-version: 17
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-17
if: matrix.java == 'temurin@17'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@17' && steps.coursier-cache-temurin-17.outputs.cache-hit != 'true'
run: sbt +update

- name: Setup Java (temurin@21)
Expand All @@ -74,10 +96,21 @@ jobs:
with:
distribution: temurin
java-version: 21
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-21
if: matrix.java == 'temurin@21'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@21' && steps.coursier-cache-temurin-21.outputs.cache-hit != 'true'
run: sbt +update

- name: Check formatting
Expand Down Expand Up @@ -140,10 +173,21 @@ jobs:
with:
distribution: temurin
java-version: 25
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-25
if: matrix.java == 'temurin@25'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@25' && steps.setup-java-temurin-25.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@25' && steps.coursier-cache-temurin-25.outputs.cache-hit != 'true'
run: sbt +update

- name: Setup Java (temurin@17)
Expand All @@ -153,10 +197,21 @@ jobs:
with:
distribution: temurin
java-version: 17
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-17
if: matrix.java == 'temurin@17'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@17' && steps.coursier-cache-temurin-17.outputs.cache-hit != 'true'
run: sbt +update

- name: Setup Java (temurin@21)
Expand All @@ -166,10 +221,21 @@ jobs:
with:
distribution: temurin
java-version: 21
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-21
if: matrix.java == 'temurin@21'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@21' && steps.coursier-cache-temurin-21.outputs.cache-hit != 'true'
run: sbt +update

- name: Download target directories (3)
Expand Down Expand Up @@ -229,10 +295,21 @@ jobs:
with:
distribution: temurin
java-version: 25
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-25
if: matrix.java == 'temurin@25'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@25' && steps.setup-java-temurin-25.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@25' && steps.coursier-cache-temurin-25.outputs.cache-hit != 'true'
run: sbt +update

- name: Setup Java (temurin@17)
Expand All @@ -242,10 +319,21 @@ jobs:
with:
distribution: temurin
java-version: 17
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-17
if: matrix.java == 'temurin@17'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@17' && steps.coursier-cache-temurin-17.outputs.cache-hit != 'true'
run: sbt +update

- name: Setup Java (temurin@21)
Expand All @@ -255,10 +343,21 @@ jobs:
with:
distribution: temurin
java-version: 21
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-21
if: matrix.java == 'temurin@21'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@21' && steps.coursier-cache-temurin-21.outputs.cache-hit != 'true'
run: sbt +update

- name: Submit Dependencies
Expand Down Expand Up @@ -315,10 +414,21 @@ jobs:
with:
distribution: temurin
java-version: 25
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-25
if: matrix.java == 'temurin@25'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@25' && steps.setup-java-temurin-25.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@25' && steps.coursier-cache-temurin-25.outputs.cache-hit != 'true'
run: sbt +update

- name: Setup Java (temurin@17)
Expand All @@ -328,10 +438,21 @@ jobs:
with:
distribution: temurin
java-version: 17
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-17
if: matrix.java == 'temurin@17'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@17' && steps.coursier-cache-temurin-17.outputs.cache-hit != 'true'
run: sbt +update

- name: Setup Java (temurin@21)
Expand All @@ -341,10 +462,21 @@ jobs:
with:
distribution: temurin
java-version: 21
cache: sbt

- name: Cache coursier + ivy + sbt boot
id: coursier-cache-temurin-21
if: matrix.java == 'temurin@21'
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: ${{ runner.os }}-sbt-

- name: sbt update
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@21' && steps.coursier-cache-temurin-21.outputs.cache-hit != 'true'
run: sbt +update

- name: Generate site
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/deploy-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,16 @@ jobs:
with:
distribution: temurin
java-version: 25
cache: sbt
- name: Cache coursier + ivy + sbt boot
uses: actions/cache@v4
with:
path: |
~/.cache/coursier
~/.ivy2/cache
~/.sbt
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt', 'project/build.properties', 'project/**/*.scala') }}
restore-keys: |
${{ runner.os }}-sbt-

- name: Build site
run: sbt 'docs/tlSite; unidocs/unidoc'
Expand Down
Loading
Loading