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
9 changes: 8 additions & 1 deletion .github/workflows/aot-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
matrix:
# Only test on Mac and Ubuntu – these are the fastest platforms.
# Windows and Linux ARM are built later after the PR is merged.
os: [macos-14, ubuntu-22.04]
os: [macos-15, ubuntu-22.04]
steps:
- uses: actions/checkout@v7

Expand All @@ -38,6 +38,13 @@ jobs:
# sbt 2 nests build outputs under target/out/<platform>/<scala version>/<project>/
mv target/out/jvm/scala-*/jelly-cli/graalvm-native-image/jelly-cli jelly-cli

# Make sure the binary still runs on macOS 14 (see graalOptions in build.sbt)
if [ "$RUNNER_OS" == "macOS" ]; then
otool -l jelly-cli | grep -A4 LC_BUILD_VERSION
otool -l jelly-cli | grep -A4 LC_BUILD_VERSION | grep -q "minos 14.0" \
|| exit 1
fi

# See if it runs at all
./jelly-cli version || exit 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-14, windows-2022, ubuntu-22.04, ubuntu-22.04-arm]
os: [macos-15, windows-2022, ubuntu-22.04, ubuntu-22.04-arm]
steps:
- uses: actions/checkout@v7

Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
- name: Rename binaries
run: |
mv jelly-cli-assembly/jelly-cli.jar jelly-cli.jar
mv jelly-cli-macos-14/jelly-cli jelly-cli-mac-arm64
mv jelly-cli-macos-15/jelly-cli jelly-cli-mac-arm64
mv jelly-cli-ubuntu-22.04/jelly-cli jelly-cli-linux-x86_64
mv jelly-cli-ubuntu-22.04-arm/jelly-cli jelly-cli-linux-arm64
mv jelly-cli-windows-2022/jelly-cli.exe jelly-cli-windows-x86_64.exe
Expand Down
4 changes: 4 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ lazy val graalOptions = Seq(
// Include XML error messages
// Issue: https://github.com/Jelly-RDF/cli/issues/217
"-H:IncludeResourceBundles=com.sun.org.apache.xerces.internal.impl.msg.XMLMessages",
) ++ (
// Without this, the minimum macOS version is the one of the build machine.
if (scala.util.Properties.isMac) Seq("-H:NativeLinkerOption=-mmacosx-version-min=14.0")
else Seq()
)

lazy val TestSerial = config("test-serial") extend Test
Expand Down
Loading