Skip to content

Commit

Permalink
Remove support for graal
Browse files Browse the repository at this point in the history
  • Loading branch information
froth committed Oct 25, 2024
1 parent 2df9b63 commit e67547b
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 228 deletions.
23 changes: 1 addition & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest]
scala: [2.12]
java: [temurin@11, temurin@17, graalvm@17]
java: [temurin@11, temurin@17]
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
Expand Down Expand Up @@ -66,29 +66,8 @@ jobs:
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
uses: actions/setup-java@v4
with:
distribution: graalvm
java-version: 17
cache: sbt

- name: sbt update
if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
run: sbt +update

- name: Check that workflows are up to date
run: sbt githubWorkflowCheck

- name: Test generated template
run: sbt '++ ${{ matrix.scala }}' g8Test

- name: Build native assembly
if: startsWith(matrix.java, 'graalvm')
run: |
cd target/sbt-test/http4s-g8/scripted
sbt assembly
gu install native-image
cat native-image-readme.md | grep 'native-image -H*' | sh
13 changes: 1 addition & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,6 @@ ThisBuild / githubWorkflowBuild := Seq(
WorkflowStep.Sbt(
List("g8Test"),
name = Some("Test generated template")
),
WorkflowStep.Run(
List(
"cd target/sbt-test/http4s-g8/scripted",
"sbt assembly",
"gu install native-image",
"cat native-image-readme.md | grep 'native-image -H*' | sh"
),
cond = Some("startsWith(matrix.java, 'graalvm')"),
name = Some("Build native assembly")
)
)

Expand All @@ -24,8 +14,7 @@ val MacOS = "macos-latest"
ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, MacOS)
ThisBuild / githubWorkflowJavaVersions := Seq(
JavaSpec.temurin("11"),
JavaSpec.temurin("17"),
JavaSpec.graalvm("17")
JavaSpec.temurin("17")
)
ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty

Expand Down

This file was deleted.

5 changes: 1 addition & 4 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ lazy val root = (project in file("."))
"io.circe" %% "circe-generic" % CirceVersion,
"org.scalameta" %% "munit" % MunitVersion % Test,
"org.typelevel" %% "munit-cats-effect" % MunitCatsEffectVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion,
$if(graal_native_image.truthy)$
"org.scalameta" % "svm-subs" % "101.0.0"
$endif$
"ch.qos.logback" % "logback-classic" % LogbackVersion
),
addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full),
addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
Expand Down
4 changes: 0 additions & 4 deletions src/main/g8/default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,3 @@ organization = com.example
package = $organization$.$name;format="norm,word"$

scala_version = 2.13.14
# graal_vm_specific
graal_native_image = true
is_linux_build = false
scala_assembly_target = scala-2.13

This file was deleted.

0 comments on commit e67547b

Please sign in to comment.