Skip to content

Commit e2bf314

Browse files
authored
Fix releases, update CI actions (#311)
1 parent dfb6fe8 commit e2bf314

4 files changed

Lines changed: 28 additions & 20 deletions

File tree

.github/workflows/aot-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# Windows and Linux ARM are built later after the PR is merged.
1414
os: [macos-14, ubuntu-22.04]
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v7
1717

1818
- uses: graalvm/setup-graalvm@v1
1919
with:
@@ -95,7 +95,7 @@ jobs:
9595
./jelly-cli sparql from-jelly ask.jellys | grep 'true' || exit 1
9696
9797
- name: Upload binary
98-
uses: actions/upload-artifact@v4
98+
uses: actions/upload-artifact@v7
9999
with:
100100
name: jelly-cli-${{ matrix.os }}
101101
path: jelly-cli

.github/workflows/checks.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ jobs:
77
name: Scalafmt lint
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v7
1111
with:
1212
fetch-depth: 1
13-
- uses: jrouly/scalafmt-native-action@v4
13+
- uses: jrouly/scalafmt-native-action@v5
1414

1515
scalafix-lint:
1616
name: Scalafix lint
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v7
2020
with:
2121
fetch-depth: 1
2222

2323
- name: Setup JDK
24-
uses: actions/setup-java@v4
24+
uses: actions/setup-java@v5
2525
with:
2626
distribution: temurin
2727
java-version: 21

.github/workflows/publish.yml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
matrix:
1313
os: [macos-14, windows-2022, ubuntu-22.04, ubuntu-22.04-arm]
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v7
1616

1717
- uses: graalvm/setup-graalvm@v1
1818
with:
@@ -27,21 +27,29 @@ jobs:
2727
- name: Build native image
2828
run: sbt GraalVMNativeImage/packageBin
2929

30+
- name: Collect the binary
31+
shell: bash
32+
run: |
33+
set -euo pipefail
34+
35+
mkdir binary
36+
# sbt 2 nests build outputs under target/out/<platform>/<scala version>/<project>/
37+
mv target/out/jvm/scala-*/jelly-cli/graalvm-native-image/* binary/
38+
3039
- name: Upload binary
31-
uses: actions/upload-artifact@v4
40+
uses: actions/upload-artifact@v7
3241
with:
3342
name: jelly-cli-${{ matrix.os }}
34-
# sbt 2 nests build outputs under target/out/<platform>/<scala version>/<project>/
35-
path: target/out/jvm/scala-*/jelly-cli/graalvm-native-image/*
43+
path: binary/*
3644

3745
jit-compile:
3846
name: Build the uber-JAR
3947
runs-on: ubuntu-latest
4048
steps:
41-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v7
4250

4351
- name: Setup JDK
44-
uses: actions/setup-java@v4
52+
uses: actions/setup-java@v5
4553
with:
4654
distribution: temurin
4755
java-version: 21
@@ -57,7 +65,7 @@ jobs:
5765
mv target/out/jvm/scala-*/jelly-cli/jelly-cli-assembly*.jar jelly-cli.jar
5866
5967
- name: Upload assembly
60-
uses: actions/upload-artifact@v4
68+
uses: actions/upload-artifact@v7
6169
with:
6270
name: jelly-cli-assembly
6371
path: jelly-cli.jar
@@ -68,7 +76,7 @@ jobs:
6876
- aot-compile
6977
- jit-compile
7078
steps:
71-
- uses: actions/download-artifact@v4
79+
- uses: actions/download-artifact@v8
7280

7381
- name: Rename binaries
7482
run: |
@@ -88,7 +96,7 @@ jobs:
8896
8997
- name: Upload binaries (pre-release)
9098
if: github.ref == 'refs/heads/main'
91-
uses: ncipollo/release-action@v1.14.0
99+
uses: ncipollo/release-action@v1.21.0
92100
with:
93101
allowUpdates: true
94102
prerelease: true
@@ -102,7 +110,7 @@ jobs:
102110

103111
- name: Upload binaries (tagged release)
104112
if: github.ref != 'refs/heads/main'
105-
uses: ncipollo/release-action@v1.14.0
113+
uses: ncipollo/release-action@v1.21.0
106114
with:
107115
prerelease: false
108116
draft: false

.github/workflows/scala.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v7
2828
with:
2929
submodules: recursive
3030

3131
- name: Setup JDK
32-
uses: actions/setup-java@v4
32+
uses: actions/setup-java@v5
3333
with:
3434
distribution: temurin
3535
java-version: ${{ matrix.java }}
@@ -45,10 +45,10 @@ jobs:
4545
test-assembly:
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v7
4949

5050
- name: Setup JDK
51-
uses: actions/setup-java@v4
51+
uses: actions/setup-java@v5
5252
with:
5353
distribution: temurin
5454
java-version: 21

0 commit comments

Comments
 (0)