From 1d66d8fab7ce21263ec466fd5bd87dcb798599c0 Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com> Date: Thu, 21 Dec 2023 14:29:59 -0500 Subject: [PATCH] Update sbt-mergify-github-actions --- .github/workflows/ci.yml | 64 ++++++++++++------------------------- .github/workflows/clean.yml | 3 +- .mergify.yml | 4 +-- project/plugins.sbt | 2 +- 4 files changed, 26 insertions(+), 47 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f55244..a24c1f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,41 +24,30 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.12, 3.3.1] - java: [temurin@11] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup Java (temurin@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 - - - name: Cache sbt - uses: actions/cache@v2 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + java-version: 8 + cache: sbt - name: Check that workflows are up to date - run: sbt ++${{ matrix.scala }} githubWorkflowCheck + run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck - name: Build project - run: sbt ++${{ matrix.scala }} test + run: sbt '++ ${{ matrix.scala }}' test - name: Check that codegen output compiles - run: sbt ++${{ matrix.scala }} 'slick-additions-codegen/Test/runMain slick.additions.codegen.CodeGen' test-codegen/compile + run: sbt '++ ${{ matrix.scala }}' 'slick-additions-codegen/Test/runMain slick.additions.codegen.CodeGen' test-codegen/compile - name: Check that codegen output hasn't changed run: git diff --exit-code --quiet HEAD slick-additions-codegen/src/test/resources @@ -69,7 +58,7 @@ jobs: run: tar cf targets.tar target slick-additions-codegen/src/test/resources/target slick-additions-entity/.jvm/target slick-additions-entity/.js/target slick-additions-codegen/target project/target - name: Upload target directories - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} path: targets.tar @@ -82,35 +71,24 @@ jobs: matrix: os: [ubuntu-latest] scala: [3.3.1] - java: [temurin@11] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup Java (temurin@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 - - - name: Cache sbt - uses: actions/cache@v2 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + java-version: 8 + cache: sbt - name: Download target directories (2.13.12) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }} @@ -120,7 +98,7 @@ jobs: rm targets.tar - name: Download target directories (3.3.1) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }} @@ -134,4 +112,4 @@ jobs: PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - run: sbt ++${{ matrix.scala }} ci-release + run: sbt ci-release diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 547aaa4..bfc865d 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -17,6 +17,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Delete artifacts + shell: bash {0} run: | # Customize those three lines with your repository and credentials: REPO=${GITHUB_API_URL}/repos/${{ github.repository }} @@ -25,7 +26,7 @@ jobs: ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; } # A temporary file which receives HTTP response headers. - TMPFILE=/tmp/tmp.$$ + TMPFILE=$(mktemp) # An associative array, key: artifact name, value: number of artifacts of that name. declare -A ARTCOUNT diff --git a/.mergify.yml b/.mergify.yml index 464e675..68052b2 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,8 +8,8 @@ pull_request_rules: - or: - author=scala-steward - author=nafg-scala-steward[bot] - - check-success=Build and Test (ubuntu-latest, 2.13.12, temurin@11) - - check-success=Build and Test (ubuntu-latest, 3.3.1, temurin@11) + - check-success=Build and Test (ubuntu-latest, 2.13.12, temurin@8) + - check-success=Build and Test (ubuntu-latest, 3.3.1, temurin@8) actions: queue: name: default diff --git a/project/plugins.sbt b/project/plugins.sbt index 34c9a70..96670ce 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") -addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.7.0") +addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.8.0")