From bc5a8246e19d570bf9d1eac1247c2c6ff03ae776 Mon Sep 17 00:00:00 2001 From: rochala Date: Fri, 2 Feb 2024 15:54:45 +0100 Subject: [PATCH] Fix release expression compiler job --- .github/workflows/release-expression-compiler.yml | 6 ++++-- build.sbt | 2 +- project/Dependencies.scala | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-expression-compiler.yml b/.github/workflows/release-expression-compiler.yml index 838ded0e9..1d3451550 100644 --- a/.github/workflows/release-expression-compiler.yml +++ b/.github/workflows/release-expression-compiler.yml @@ -42,8 +42,10 @@ jobs: jvm: 'adopt:1.8.0-292' - name: setup GPG secret key run: echo ${{ secrets.PGP_SECRET }} | base64 --decode | gpg --batch --import - - run: sbt 'expressionCompiler3/publishSigned;sonatypeBundleRelease' - if: startsWith(inputs.scala-version, '3') && !startsWith(inputs.scala-version, '3.0') + - run: sbt 'expressionCompiler3_3/publishSigned;sonatypeBundleRelease' + if: startsWith(inputs.scala-version, '3.1') || startsWith(inputs.scala-version, '3.2') || startsWith(inputs.scala-version, '3.3') + - run: sbt 'expressionCompiler3_4/publishSigned;sonatypeBundleRelease' + if: startsWith(inputs.scala-version, '3.4') - run: sbt 'expressionCompiler3_0/publishSigned;sonatypeBundleRelease' if: startsWith(inputs.scala-version, '3.0') - run: sbt 'expressionCompiler2_13/publishSigned;sonatypeBundleRelease' diff --git a/build.sbt b/build.sbt index c60ae185e..c34c74946 100644 --- a/build.sbt +++ b/build.sbt @@ -174,7 +174,7 @@ lazy val expressionCompiler = projectMatrix case (2, 13) => Seq("2.13.11", "2.13.10", "2.13.9", "2.13.8", "2.13.7", "2.13.6", "2.13.5", "2.13.4", "2.13.3") case (3, 0) => Seq("3.0.2", "3.0.1", "3.0.0") case (3, 1 | 2 | 3) => Seq("3.3.1", "3.3.0", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0") - case (3, _) => Seq("3.4.0-RC2") + case (3, _) => Seq("3.4.0-RC4") } .toSeq .flatten, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8b1ec33bf..143455054 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ object Dependencies { val scala213 = scalaEnvVersion.filter(isScala213).getOrElse("2.13.11") val scala30 = scalaEnvVersion.filter(isScala30).getOrElse("3.0.2") val scala33 = scalaEnvVersion.filter(isScala33).getOrElse("3.3.1") - val scala34 = scalaEnvVersion.filter(isScala34).getOrElse("3.4.0-RC2") + val scala34 = scalaEnvVersion.filter(isScala34).getOrElse("3.4.0-RC4") val asmVersion = "9.5" val coursierVersion = "2.1.5"