From a58a2e45ca64d8376abef9548d5d6779ab87e74c Mon Sep 17 00:00:00 2001
From: Friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Tue, 24 Dec 2024 12:23:03 -0800
Subject: [PATCH 1/2] Fix Scala CLA for 1.x branch

---
 .github/workflows/cla.yml | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 61a1ab1f..3549dedc 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -1,24 +1,11 @@
-name: Scala CLA
-on: [pull_request]
+name: "Check Scala CLA"
+on:
+  pull_request:
 jobs:
-  check:
+  cla-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Check CLA
-        env:
-          AUTHOR: ${{ github.event.pull_request.user.login }}
-        run: |
-          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;
+      - name: Verify CLA
+        uses: scala/cla-checker@v1
+        with:
+          author: ${{ github.event.pull_request.user.login }}

From 312f24082da39212dcf2a89305dd980bf36589da Mon Sep 17 00:00:00 2001
From: Friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Tue, 24 Dec 2024 15:26:51 -0800
Subject: [PATCH 2/2] Fix setup-sbt

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 067dc566..409fe75d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,6 +18,8 @@ jobs:
         distribution: 'adopt'
         java-version: '11'
         cache: 'sbt'
+    - name: Setup sbt
+      uses: sbt/setup-sbt@v1
     - name: Setup node
       uses: actions/setup-node@v4
       with: