From c1041ecd83f0d07ea6978fa70f3e507e5450dee9 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Sun, 16 Mar 2025 14:06:50 +0100
Subject: [PATCH 1/5] test ci with new runners

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index db2a66b8b234..452c8a9d5644 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -54,7 +54,7 @@ env:
 
 jobs:
   test_non_bootstrapped:
-    runs-on: [self-hosted, Linux]
+    runs-on: scala-test
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096

From 3b14d14357c622ea0f20341c2fe7736cafd60685 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Sun, 16 Mar 2025 14:07:49 +0100
Subject: [PATCH 2/5] Update ci.yaml

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 452c8a9d5644..7060695c2cff 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -106,7 +106,7 @@ jobs:
           ./project/scripts/cmdTests
 
   test:
-    runs-on: [self-hosted, Linux]
+    runs-on: scala-test
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096

From a81f5b9d3f827ec920120743bccbdb526de38068 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Sun, 16 Mar 2025 14:31:57 +0100
Subject: [PATCH 3/5] test with new configuration

---
 .github/workflows/ci.yaml | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7060695c2cff..bd305d945eb3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -55,13 +55,6 @@ env:
 jobs:
   test_non_bootstrapped:
     runs-on: scala-test
-    container:
-      image: lampepfl/dotty:2024-10-18
-      options: --cpu-shares 4096
-      volumes:
-        - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
-        - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
-        - ${{ github.workspace }}/../../cache/general:/root/.cache
     if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
          || github.event_name == 'push'
          || (
@@ -74,27 +67,16 @@ jobs:
            && github.repository == 'scala/scala3'
          )"
     steps:
-      - name: Set JDK 17 as default
-        run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
-
-      ## Workaround for https://github.com/actions/runner/issues/2033 (See https://github.com/scala/scala3/pull/19720)
-      - name: Reset existing repo
-        run: |
-          git config --global --add safe.directory $GITHUB_WORKSPACE
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
-
-      - name: Checkout cleanup script
-        uses: actions/checkout@v4
-
-      - name: Cleanup
-        run: .github/workflows/cleanup.sh
-
-      - name: Git Checkout
+      - name: Configure JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'sbt'
+      - name: Configure sbt
+        uses: sbt/setup-sbt@v1
+      - name: Checkout Repository
         uses: actions/checkout@v4
-
-      - name: Add SBT proxy repositories
-        run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
-
       - name: Test
         # DON'T add dist/Universal/stage!
         # Adding dist/Universal/stage bootstraps the compiler

From 8a211561ca183be55fc4b0a77650821a7fc70b33 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Sun, 16 Mar 2025 14:35:28 +0100
Subject: [PATCH 4/5] checkout the repository first

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

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bd305d945eb3..275f31d6c9a3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -67,6 +67,8 @@ jobs:
            && github.repository == 'scala/scala3'
          )"
     steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
       - name: Configure JDK 11
         uses: actions/setup-java@v4
         with:
@@ -75,8 +77,6 @@ jobs:
           cache: 'sbt'
       - name: Configure sbt
         uses: sbt/setup-sbt@v1
-      - name: Checkout Repository
-        uses: actions/checkout@v4
       - name: Test
         # DON'T add dist/Universal/stage!
         # Adding dist/Universal/stage bootstraps the compiler

From b6bd083e9b06dcb4c97a08bb9fd4d234b2719147 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamza@remmal.net>
Date: Sun, 16 Mar 2025 15:55:18 +0100
Subject: [PATCH 5/5] Update ci.yaml

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 275f31d6c9a3..1506aee9735c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -88,7 +88,7 @@ jobs:
           ./project/scripts/cmdTests
 
   test:
-    runs-on: scala-test
+    runs-on: [self-hosted, Linux]
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096