Skip to content

Commit

Permalink
Test workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
harryzcy committed Jul 11, 2024
1 parent 536c1b4 commit 4b2985b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
- name: Set up GraalVM
uses: graalvm/setup-graalvm@v1
with:
version: '22.3.0'
version: '22.3.3'
java-version: '11'
components: 'native-image'
native-image-musl: ${{ matrix.libc == 'musl' }}
Expand All @@ -108,7 +108,6 @@ jobs:
dockerize:
needs: [native-image,test]
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/v') && github.event_name != 'release'
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -132,5 +131,5 @@ jobs:
with:
context: .
platforms: linux/amd64,linux/arm64/v8
push: true
push: ${{ startsWith(github.ref, 'refs/tags/v') && github.event_name != 'release' }}
tags: ${{ steps.meta.outputs.tags }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM sbtscala/scala-sbt:graalvm-ce-22.3.0-b2-java11_1.9.5_3.3.1 AS builder
FROM sbtscala/scala-sbt:graalvm-ce-22.3.3-b1-java17_1.10.1_3.4.2 AS builder

WORKDIR /app

Expand Down
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def localSnapshotVersion: String = s"$parseTagVersion-SNAPSHOT"
def isCI = System.getenv("CI") != null

def scala212 = "2.12.19"
def scala213 = "2.13.13"
def scala213 = "2.13.14"

inThisBuild(List(
version ~= { dynVer =>
Expand Down Expand Up @@ -175,7 +175,8 @@ lazy val cli = project.in(file("scalafmt-cli")).settings(
),
scalacOptions ++= scalacJvmOptions.value,
Compile / mainClass := Some("org.scalafmt.cli.Cli"),
nativeImageVersion := "22.3.0",
nativeImageVersion := "22.3.3",
nativeImageJvm := "graalvm-java17",
nativeImageInstalled := isCI,
nativeImageOptions ++= {
val isMusl = sys.env.get("NATIVE_IMAGE_MUSL").exists(_.toBoolean)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1

0 comments on commit 4b2985b

Please sign in to comment.