From 55913e59ce471e7f886a37d423ec70e3ae380e91 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 29 Sep 2024 00:10:02 +0000 Subject: [PATCH 1/2] Update sbt-mergify-github-actions to 0.9.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 552917d..00ca2c0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.3") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") -addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.7.0") +addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.9.0") From 0fe788de463025b14c252e9df018d5329516e863 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 29 Sep 2024 00:10:38 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 68 ++++++++++++++----------------------- .github/workflows/clean.yml | 3 +- .mergify.yml | 9 ++--- 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d484d8..681bb51 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,44 +23,36 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.17, 2.13.10] - java: [temurin@11] + java: [zulu@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 (zulu@8) + if: matrix.java == 'zulu@8' + uses: actions/setup-java@v4 with: - distribution: temurin - java-version: 11 + distribution: zulu + java-version: 8 + cache: sbt - - 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') }} + - name: Setup sbt + uses: sbt/setup-sbt@v1 - 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: Compress target directories run: tar cf targets.tar target slick-cats/target slick-cats-docs/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 @@ -73,35 +65,27 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.17] - java: [temurin@11] + java: [zulu@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 (zulu@8) + if: matrix.java == 'zulu@8' + uses: actions/setup-java@v4 with: - distribution: temurin - java-version: 11 + distribution: zulu + java-version: 8 + cache: sbt - - 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') }} + - name: Setup sbt + uses: sbt/setup-sbt@v1 - name: Download target directories (2.12.17) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }} @@ -111,7 +95,7 @@ jobs: rm targets.tar - name: Download target directories (2.13.10) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }} @@ -121,4 +105,4 @@ jobs: rm targets.tar - name: Publish project - run: sbt ++${{ matrix.scala }} +publish + run: sbt +publish 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 127451b..606bdb1 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,7 +1,7 @@ defaults: {} queue_rules: - name: default - conditions: [] + merge_conditions: [] pull_request_rules: - name: Automatically merge successful Scala Steward PRs conditions: @@ -9,7 +9,8 @@ pull_request_rules: - author=scala-steward - author=slick-scala-steward[bot] - author=renovate[bot] - - check-success=Build and Test (ubuntu-latest, 2.12.17, temurin@11) - - check-success=Build and Test (ubuntu-latest, 2.13.10, temurin@11) + - check-success=Build and Test (ubuntu-latest, 2.12.17, zulu@8) + - check-success=Build and Test (ubuntu-latest, 2.13.10, zulu@8) actions: - queue: {} + queue: + name: default