Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for graal #416

Merged
merged 1 commit into from
Oct 28, 2024
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
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
11 changes: 0 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,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")
)
)

val PrimaryOS = "ubuntu-latest"
Expand All @@ -22,7 +12,6 @@ ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, MacOS)
ThisBuild / githubWorkflowJavaVersions := Seq(
JavaSpec.temurin("11"),
JavaSpec.temurin("17"),
JavaSpec.graalvm("17")
)
ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty

Expand Down

This file was deleted.

3 changes: 0 additions & 3 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ lazy val root = (project in file("."))
"org.scalameta" %% "munit" % MunitVersion % Test,
"org.typelevel" %% "munit-cats-effect" % MunitCatsEffectVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion % Runtime,
$if(graal_native_image.truthy)$
"org.scalameta" % "svm-subs" % "101.0.0"
$endif$
),
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.