From 48b2d7eb809d98bad204df9b1f962e2883b5f753 Mon Sep 17 00:00:00 2001 From: Ostrzyciel Date: Tue, 18 Aug 2026 23:58:31 +0200 Subject: [PATCH] Fix releases, update CI actions --- .github/workflows/aot-test.yml | 4 ++-- .github/workflows/checks.yml | 8 ++++---- .github/workflows/publish.yml | 28 ++++++++++++++++++---------- .github/workflows/scala.yml | 8 ++++---- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/.github/workflows/aot-test.yml b/.github/workflows/aot-test.yml index c3d6385..6d8925e 100644 --- a/.github/workflows/aot-test.yml +++ b/.github/workflows/aot-test.yml @@ -13,7 +13,7 @@ jobs: # Windows and Linux ARM are built later after the PR is merged. os: [macos-14, ubuntu-22.04] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - uses: graalvm/setup-graalvm@v1 with: @@ -95,7 +95,7 @@ jobs: ./jelly-cli sparql from-jelly ask.jellys | grep 'true' || exit 1 - name: Upload binary - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: jelly-cli-${{ matrix.os }} path: jelly-cli diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 178d5cb..0345225 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -7,21 +7,21 @@ jobs: name: Scalafmt lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: fetch-depth: 1 - - uses: jrouly/scalafmt-native-action@v4 + - uses: jrouly/scalafmt-native-action@v5 scalafix-lint: name: Scalafix lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: fetch-depth: 1 - name: Setup JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: 21 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 979aa4b..cec79b1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,7 @@ jobs: matrix: os: [macos-14, windows-2022, ubuntu-22.04, ubuntu-22.04-arm] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - uses: graalvm/setup-graalvm@v1 with: @@ -27,21 +27,29 @@ jobs: - name: Build native image run: sbt GraalVMNativeImage/packageBin + - name: Collect the binary + shell: bash + run: | + set -euo pipefail + + mkdir binary + # sbt 2 nests build outputs under target/out//// + mv target/out/jvm/scala-*/jelly-cli/graalvm-native-image/* binary/ + - name: Upload binary - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: jelly-cli-${{ matrix.os }} - # sbt 2 nests build outputs under target/out//// - path: target/out/jvm/scala-*/jelly-cli/graalvm-native-image/* + path: binary/* jit-compile: name: Build the uber-JAR runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Setup JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: 21 @@ -57,7 +65,7 @@ jobs: mv target/out/jvm/scala-*/jelly-cli/jelly-cli-assembly*.jar jelly-cli.jar - name: Upload assembly - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: jelly-cli-assembly path: jelly-cli.jar @@ -68,7 +76,7 @@ jobs: - aot-compile - jit-compile steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 - name: Rename binaries run: | @@ -88,7 +96,7 @@ jobs: - name: Upload binaries (pre-release) if: github.ref == 'refs/heads/main' - uses: ncipollo/release-action@v1.14.0 + uses: ncipollo/release-action@v1.21.0 with: allowUpdates: true prerelease: true @@ -102,7 +110,7 @@ jobs: - name: Upload binaries (tagged release) if: github.ref != 'refs/heads/main' - uses: ncipollo/release-action@v1.14.0 + uses: ncipollo/release-action@v1.21.0 with: prerelease: false draft: false diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 6742803..374c017 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -24,12 +24,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: submodules: recursive - name: Setup JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: ${{ matrix.java }} @@ -45,10 +45,10 @@ jobs: test-assembly: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Setup JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: 21