From 208946f1ffadf189ab9532d287c81db6470a4ff0 Mon Sep 17 00:00:00 2001 From: jules Ivanic Date: Sat, 13 Apr 2024 13:35:24 +0800 Subject: [PATCH] Modernize/Update CI --- .github/dependabot.yml | 6 ++++++ .github/renovate.json | 13 ------------- .github/workflows/ci.yml | 11 +++++------ .github/workflows/scala-steward.yml | 21 +++++++++++++++++++++ project/plugins.sbt | 2 +- 5 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 .github/dependabot.yml delete mode 100644 .github/renovate.json create mode 100644 .github/workflows/scala-steward.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..120c6893b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" \ No newline at end of file diff --git a/.github/renovate.json b/.github/renovate.json deleted file mode 100644 index 86e50ef6c..000000000 --- a/.github/renovate.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "automerge": true, - "rebaseWhen": "conflicted", - "labels": ["type: dependencies"], - "packageRules": [ - { - "matchManagers": [ - "sbt" - ], - "enabled": false - } - ] -} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc6739e3f..5af2df86b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,6 @@ name: CI env: JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -XX:MaxMetaspaceSize=4G -Xmx4G -Xss8M # JDK_JAVA_OPTIONS is _the_ env. variable to use for modern Java - JVM_OPTS: -XX:+PrintCommandLineFlags -XX:MaxMetaspaceSize=4G -Xmx4G -Xss8M # for Java 8 only (sadly, it is not modern enough for JDK_JAVA_OPTIONS) NODE_OPTIONS: --max_old_space_size=6144 on: @@ -77,7 +76,7 @@ jobs: uses: actions/setup-java@v2.5.1 with: distribution: temurin - java-version: 8 # ensure it works on 8 because we publish for 8 + java-version: 11 # ensure it works on 11 because we publish for 11 check-latest: true - name: Setup NodeJs uses: actions/setup-node@v4 @@ -141,7 +140,7 @@ jobs: strategy: fail-fast: false matrix: - java: ['8', '11'] + java: ['11', '17', '21'] platform: ['JVM'] steps: - name: Checkout current branch @@ -207,7 +206,7 @@ jobs: uses: actions/setup-java@v3.12.0 with: distribution: temurin - java-version: '8' + java-version: '17' check-latest: true - name: Cache Dependencies uses: coursier/cache-action@v6 @@ -274,7 +273,7 @@ jobs: uses: actions/setup-java@v2.5.1 with: distribution: temurin - java-version: 8 # publish for 8 + java-version: 11 # publish for 11 check-latest: true - name: Cache scala dependencies uses: coursier/cache-action@v6 @@ -310,7 +309,7 @@ jobs: uses: actions/setup-java@v3.12.0 with: distribution: temurin - java-version: '8' + java-version: '11' check-latest: true - name: Cache Dependencies uses: coursier/cache-action@v6 diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml new file mode 100644 index 000000000..dccdd041d --- /dev/null +++ b/.github/workflows/scala-steward.yml @@ -0,0 +1,21 @@ +name: Scala Steward + +# This workflow will launch everyday at 00:00 +on: + schedule: + - cron: '0 0 * * *' + workflow_dispatch: {} + +jobs: + scala-steward: + timeout-minutes: 45 + runs-on: ubuntu-latest + name: Scala Steward + steps: + - name: Scala Steward + uses: scala-steward-org/scala-steward-action@v2.65.0 + with: + github-app-id: ${{ secrets.SCALA_STEWARD_GITHUB_APP_ID }} + github-app-installation-id: ${{ secrets.SCALA_STEWARD_GITHUB_APP_INSTALLATION_ID }} + github-app-key: ${{ secrets.SCALA_STEWARD_GITHUB_APP_PRIVATE_KEY }} + github-app-auth-only: true diff --git a/project/plugins.sbt b/project/plugins.sbt index 0dd56b13d..a792592cb 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -15,4 +15,4 @@ addSbtPlugin("org.scalameta" % "sbt-mdoc" addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") addSbtPlugin("pl.project13.scala" % "sbt-jcstress" % "0.2.0") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7") -addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.4.0-alpha.22") +addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.4.0-alpha.25")