Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/aot-test.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand DownExpand Up@@ -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
8 changes: 4 additions & 4 deletions .github/workflows/checks.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
28 changes: 18 additions & 10 deletions .github/workflows/publish.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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:
Expand All@@ -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/<platform>/<scala version>/<project>/
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/<platform>/<scala version>/<project>/
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
Expand All@@ -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
Expand All@@ -68,7 +76,7 @@ jobs:
- aot-compile
- jit-compile
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8

- name: Rename binaries
run: |
Expand All@@ -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
Expand All@@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/scala.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}
Expand All@@ -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
Expand Down