Skip to content

Commit

Permalink
Merge branch 'master' into update/sbt-1.9.8
Browse files Browse the repository at this point in the history
  • Loading branch information
mschuwalow authored Jan 14, 2024
2 parents c9bb58d + 227a5c7 commit 9a3b3bf
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
auto-approve:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: hmarr/[email protected]
if: github.actor == 'scala-steward' || github.actor == 'renovate[bot]'
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ on:

jobs:
lint:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 30
steps:
- name: Checkout current branch
uses: actions/checkout@v3.4.0
uses: actions/checkout@v4.0.0
with:
fetch-depth: 0
- name: Setup Java
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: 17
Expand All @@ -33,7 +33,7 @@ jobs:
run: ./sbt check

compile:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 30
strategy:
fail-fast: false
Expand All @@ -42,11 +42,11 @@ jobs:
scala: ['2.12.17', '2.13.10', '3.2.2']
steps:
- name: Checkout current branch
uses: actions/checkout@v3.4.0
uses: actions/checkout@v4.0.0
with:
fetch-depth: 0
- name: Setup Java
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: ${{ matrix.java }}
Expand All @@ -57,7 +57,7 @@ jobs:
run: ./sbt ++${{ matrix.scala }}! compileSources

test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 30
strategy:
fail-fast: false
Expand All @@ -66,11 +66,11 @@ jobs:
scala: ['2.12.17', '2.13.10', '3.2.2']
steps:
- name: Checkout current branch
uses: actions/checkout@v3.4.0
uses: actions/checkout@v4.0.0
with:
fetch-depth: 0
- name: Setup Java
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: ${{ matrix.java }}
Expand All @@ -81,13 +81,13 @@ jobs:
run: ./sbt ++${{ matrix.scala }}! testAll

publishLocal:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 30
steps:
- name: Checkout current branch
uses: actions/checkout@v3.4.0
uses: actions/checkout@v4.0.0
- name: Setup Java
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: 8
Expand All @@ -98,13 +98,13 @@ jobs:
run: ./sbt +publishLocal

website:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 30
steps:
- name: Checkout current branch
uses: actions/checkout@v3.4.0
uses: actions/checkout@v4.0.0
- name: Setup Java
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: 17
Expand All @@ -115,24 +115,24 @@ jobs:
run: ./sbt docs/compileDocs

ci:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [lint, compile, test, publishLocal, website]
steps:
- name: Aggregate outcomes
run: echo "build succeeded"

publish:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 30
needs: [ci]
if: github.event_name != 'pull_request'
steps:
- name: Checkout current branch
uses: actions/checkout@v3.4.0
uses: actions/checkout@v4.0.0
with:
fetch-depth: 0
- name: Setup Java
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: temurin
java-version: 8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
update_release_draft:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: release-drafter/release-drafter@v5
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
fetch-depth: '0'
- name: Setup Scala
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.9.0
with:
distribution: temurin
java-version: 17
Expand All @@ -45,7 +45,7 @@ jobs:
with:
fetch-depth: '0'
- name: Setup Scala
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.9.0
with:
distribution: temurin
java-version: 17
Expand All @@ -70,7 +70,7 @@ jobs:
ref: ${{ github.head_ref }}
fetch-depth: '0'
- name: Setup Scala
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.9.0
with:
distribution: temurin
java-version: 17
Expand All @@ -84,7 +84,7 @@ jobs:
git add README.md
git commit -m "Update README.md" || echo "No changes to commit"
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5.0.2
uses: peter-evans/create-pull-request@v4.2.3
with:
body: |-
Autogenerated changes after running the `sbt docs/generateReadme` command of the [zio-sbt-website](https://zio.dev/zio-sbt) plugin.
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0"
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.10")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")

libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.3"

0 comments on commit 9a3b3bf

Please sign in to comment.