Skip to content

Commit ee78f84

Browse files
mattisboeckleLena Käufel
authored andcommitted
Bump to llvm version 18 in CI (effekt-lang#887)
We are running into problems where the versions used for development and for the CI are differing so much that we sometimes write code in development that is invalid in the CI. (See effekt-lang#877) I propose upping the Version to 18, which seems to be the Ubuntu standard Edit: the latest release is 20.1.0, so we are also not in unstable territory
1 parent 3773ff2 commit ee78f84

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/actions/setup-effekt/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ inputs:
1313
llvm-version:
1414
description: 'LLVM version to install'
1515
required: false
16-
default: '15'
16+
default: '18'
1717
install-dependencies:
1818
description: 'Whether to install system dependencies (Linux only)'
1919
required: false

effekt/jvm/src/main/scala/effekt/EffektConfig.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ class EffektConfig(args: Seq[String]) extends REPLConfig(args.takeWhile(_ != "--
6868

6969
val llvmVersion: ScallopOption[String] = opt[String](
7070
"llvm-version",
71-
descr = "the llvm version that should be used to compile the generated programs (only necessary if backend is llvm, defaults to 15)",
72-
default = Some(sys.env.getOrElse("EFFEKT_LLVM_VERSION", "15")),
71+
descr = "the llvm version that should be used to compile the generated programs (only necessary if backend is llvm, defaults to 18)",
72+
default = Some(sys.env.getOrElse("EFFEKT_LLVM_VERSION", "18")),
7373
noshort = true,
7474
group = advanced
7575
)

effekt/jvm/src/main/scala/effekt/Runner.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ object LLVMRunner extends Runner[String] {
267267
override def includes(path: File): List[File] = List(path / ".." / "llvm")
268268

269269
lazy val gccCmd = discoverExecutable(List("cc", "clang", "gcc"), List("--version"))
270-
lazy val llcCmd = discoverExecutable(List("llc", "llc-15", "llc-16"), List("--version"))
271-
lazy val optCmd = discoverExecutable(List("opt", "opt-15", "opt-16"), List("--version"))
270+
lazy val llcCmd = discoverExecutable(List("llc", "llc-18"), List("--version"))
271+
lazy val optCmd = discoverExecutable(List("opt", "opt-18"), List("--version"))
272272

273273
def checkSetup(): Either[String, Unit] =
274274
gccCmd.getOrElseAborting { return Left("Cannot find gcc. This is required to use the LLVM backend.") }

0 commit comments

Comments
 (0)