From 327e1f2d1cdad1af3c8d2abbe86bf8c07ee0da5b Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Tue, 10 Dec 2024 17:07:36 +0100 Subject: [PATCH 1/4] Update Scala version to 3.6.2 --- src/main/g8/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 0059259..7d19f1b 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 root = project .in(file(".")) From 0175b00fd61ba149dfd999023b861180d100289b Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Tue, 10 Dec 2024 17:11:49 +0100 Subject: [PATCH 2/4] Fix CLA check --- .github/workflows/cla.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 52f5eca..2dfa0b7 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 + with: + author: ${{ github.event.pull_request.user.login }} From 5b3cfbd73312d837042cb6e4de22e023f956c8fc Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Tue, 10 Dec 2024 17:12:32 +0100 Subject: [PATCH 3/4] Remove redundant check-cla.sh script --- project/scripts/check-cla.sh | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100755 project/scripts/check-cla.sh 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; From 8f1f450d8e7bda529de01fbf072dcf32b0600000 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Tue, 10 Dec 2024 17:15:04 +0100 Subject: [PATCH 4/4] Fix usage of cla-verification-action --- .github/workflows/cla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 2dfa0b7..93eac89 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -4,6 +4,6 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: scala/cla-verification-action + - uses: scala/cla-verification-action@main with: author: ${{ github.event.pull_request.user.login }}