From 1d5571a0a202dd118766e6df0a5d07eadc1e4fbf Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Tue, 10 Dec 2024 17:07:44 +0100 Subject: [PATCH 1/2] Update Scala version to 3.6.2 --- src/main/g8/build.sbt | 2 +- src/main/g8/inspector/src/main/scala/inspector/Main.scala | 2 +- src/main/g8/inspector/src/test/scala/inspector/Test.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 53e4f7c..0188ca4 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,4 +1,4 @@ -val scala3Version = "3.5.2" +val scala3Version = "3.6.2" lazy val lib = project .in(file("lib")) diff --git a/src/main/g8/inspector/src/main/scala/inspector/Main.scala b/src/main/g8/inspector/src/main/scala/inspector/Main.scala index b5348ba..68bbbf7 100644 --- a/src/main/g8/inspector/src/main/scala/inspector/Main.scala +++ b/src/main/g8/inspector/src/main/scala/inspector/Main.scala @@ -3,6 +3,6 @@ package inspector import scala.quoted._ @main def run = - val tastyFile = "lib/target/scala-3.5.2/classes/lib/Greetings.tasty" + val tastyFile = "lib/target/scala-3.6.2/classes/lib/Greetings.tasty" val tastyContents = Inspector.showCodeOf(tastyFile) println(tastyContents) diff --git a/src/main/g8/inspector/src/test/scala/inspector/Test.scala b/src/main/g8/inspector/src/test/scala/inspector/Test.scala index 5a8ef23..e23a037 100644 --- a/src/main/g8/inspector/src/test/scala/inspector/Test.scala +++ b/src/main/g8/inspector/src/test/scala/inspector/Test.scala @@ -14,7 +14,7 @@ class InspectorTest { | def hello(name: scala.Predef.String): scala.Predef.String = "Hello ".+(name) | } |}""".stripMargin, - Inspector.showCodeOf("lib/target/scala-3.5.2/classes/lib/Greetings.tasty") + Inspector.showCodeOf("lib/target/scala-3.6.2/classes/lib/Greetings.tasty") ) } From c472a4dedf269a2ddaee4dbac775ec81185d04b0 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Tue, 10 Dec 2024 17:16:37 +0100 Subject: [PATCH 2/2] Fix CLA check --- .github/workflows/cla.yml | 7 +++---- project/scripts/check-cla.sh | 17 ----------------- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100755 project/scripts/check-cla.sh diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 52f5eca..93eac89 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -4,7 +4,6 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - run: ./project/scripts/check-cla.sh - env: - AUTHOR: ${{ github.event.pull_request.user.login }} + - uses: scala/cla-verification-action@main + with: + author: ${{ github.event.pull_request.user.login }} diff --git a/project/scripts/check-cla.sh b/project/scripts/check-cla.sh deleted file mode 100755 index 8538a27..0000000 --- a/project/scripts/check-cla.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -set -eux - -AUTHOR=$GITHUB_ACTOR -echo "Pull request submitted by $AUTHOR"; -signed=$(curl -s https://www.lightbend.com/contribute/cla/scala/check/$AUTHOR | jq -r ".signed"); -if [ "$signed" = "true" ] ; then - echo "CLA check for $AUTHOR successful"; -else - echo "CLA check for $AUTHOR failed"; - echo "Please sign the Scala CLA to contribute to the Scala compiler."; - echo "Go to https://www.lightbend.com/contribute/cla/scala and then"; - echo "comment on the pull request to ask for a new check."; - echo ""; - echo "Check if CLA is signed: https://www.lightbend.com/contribute/cla/scala/check/$AUTHOR"; - exit 1; -fi;