From a55947a98e9edda57609c6dad81e6c8bdd90dee2 Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Thu, 5 Dec 2024 20:00:22 +0100
Subject: [PATCH 1/4] Use GitHub hosted runners

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

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9cd0f0b3899c..70d246ee0cc1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -46,7 +46,7 @@ env:
 
 jobs:
   test_non_bootstrapped:
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096
@@ -98,7 +98,7 @@ jobs:
           ./project/scripts/cmdTests
 
   test:
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096
@@ -152,7 +152,7 @@ jobs:
 
 
   test_windows_fast:
-    runs-on: [self-hosted, Windows]
+    runs-on: windows-2022
     if: "(
            github.event_name == 'push'
            && github.ref != 'refs/heads/main'
@@ -199,7 +199,7 @@ jobs:
         shell: cmd
 
   test_windows_full:
-    runs-on: [self-hosted, Windows]
+    runs-on: windows-2022
     if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
          || github.event_name == 'push'
          || (
@@ -228,7 +228,7 @@ jobs:
 
   mima:
     name: MiMa
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096
@@ -274,7 +274,7 @@ jobs:
           ./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues"
 
   community_build_a:
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096
@@ -328,7 +328,7 @@ jobs:
         run: cat community-build/dotty-community-build-deps || true
 
   community_build_b:
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096
@@ -382,7 +382,7 @@ jobs:
         run: cat community-build/dotty-community-build-deps || true
 
   community_build_c:
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096
@@ -436,7 +436,7 @@ jobs:
         run: cat community-build/dotty-community-build-deps || true
 
   test_sbt:
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096
@@ -481,7 +481,7 @@ jobs:
         run: ./project/scripts/sbt "sbt-test/scripted; sbt-community-build/scripted"
 
   test_java8:
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096
@@ -537,7 +537,7 @@ jobs:
           ./project/scripts/sbt ";sjsSandbox/run ;sjsSandbox/test ;sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test"
 
   publish_nightly:
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096
@@ -600,7 +600,7 @@ jobs:
           ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleRelease"
 
   nightly_documentation:
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096
@@ -654,7 +654,7 @@ jobs:
   publish_release:
     permissions:
       contents: write  # for actions/create-release to create a release
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
       options: --cpu-shares 4096
@@ -756,7 +756,7 @@ jobs:
 
 
   open_issue_on_failure:
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-24.04
     container:
       image: lampepfl/dotty:2024-10-18
     needs: [nightly_documentation, test_windows_full]

From 00fe884a6d62a7b6c4bbf3d435c4878cfcd05e91 Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Thu, 5 Dec 2024 20:04:23 +0100
Subject: [PATCH 2/4] Fix git configs in the scala3-lts repo

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

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 70d246ee0cc1..662c650a08c2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -72,8 +72,8 @@ jobs:
       ## 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 /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
         uses: actions/checkout@v4
@@ -125,8 +125,8 @@ jobs:
 
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
         uses: actions/checkout@v4
@@ -168,8 +168,8 @@ jobs:
       - name: Reset existing repo
         shell: cmd
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -212,8 +212,8 @@ jobs:
       - name: Reset existing repo
         shell: cmd
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -254,8 +254,8 @@ jobs:
 
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
         uses: actions/checkout@v4
@@ -301,8 +301,8 @@ jobs:
         run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
         uses: actions/checkout@v4
@@ -318,7 +318,7 @@ jobs:
 
       - name: Test
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
           git submodule sync
           git submodule update --init --recursive --jobs 7
           ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
@@ -355,8 +355,8 @@ jobs:
         run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
         uses: actions/checkout@v4
@@ -372,7 +372,7 @@ jobs:
 
       - name: Test
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
           git submodule sync
           git submodule update --init --recursive --jobs 7
           ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
@@ -409,8 +409,8 @@ jobs:
         run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
         uses: actions/checkout@v4
@@ -426,7 +426,7 @@ jobs:
 
       - name: Test
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
           git submodule sync
           git submodule update --init --recursive --jobs 7
           ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
@@ -462,8 +462,8 @@ jobs:
 
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
         uses: actions/checkout@v4
@@ -511,8 +511,8 @@ jobs:
 
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
         uses: actions/checkout@v4
@@ -559,8 +559,8 @@ jobs:
         run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
         uses: actions/checkout@v4
@@ -623,8 +623,8 @@ jobs:
     steps:
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
         uses: actions/checkout@v4
@@ -640,7 +640,7 @@ jobs:
 
       - name: Generate Website
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
           ./project/scripts/genDocs -doc-snapshot
 
       - name: Deploy Website to dotty-website
@@ -678,8 +678,8 @@ jobs:
         run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
       - name: Reset existing repo
         run: |
-          git config --global --add safe.directory /__w/scala3/scala3
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
+          git config --global --add safe.directory /__w/scala3-lts/scala3-lts
+          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
       - name: Checkout cleanup script
         uses: actions/checkout@v4

From 9e049b8713ee8538a43fea63f4063291815ec986 Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Thu, 5 Dec 2024 22:56:17 +0100
Subject: [PATCH 3/4] Update SOURCE_LINKS_REPOSITORY for scaladoc tests

---
 project/scripts/cmdScaladocTests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests
index 610f98a55890..94da20dccb86 100755
--- a/project/scripts/cmdScaladocTests
+++ b/project/scripts/cmdScaladocTests
@@ -16,7 +16,7 @@ DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND | ta
 DOTTY_BOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyVersion)\""
 DOTTY_BOOTSTRAPPED_VERSION=$(eval $DOTTY_BOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1)
 
-SOURCE_LINKS_REPOSITORY="scala/scala3"
+SOURCE_LINKS_REPOSITORY="scala/scala3-lts"
 SOURCE_LINKS_VERSION="${GITHUB_SHA:-$DOTTY_BOOTSTRAPPED_VERSION}"
 
 "$SBT" "scaladoc/generateTestcasesDocumentation" > "$tmp" 2>&1 || echo "generated testcases project with sbt"

From 0081dbdc4eb9f897756f4cc086f17f76cefde76b Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Fri, 6 Dec 2024 10:38:48 +0100
Subject: [PATCH 4/4] Install cygwin

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

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 662c650a08c2..b4cf13494616 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -168,6 +168,7 @@ jobs:
       - name: Reset existing repo
         shell: cmd
         run: |
+          git config --global core.autocrlf input
           git config --global --add safe.directory /__w/scala3-lts/scala3-lts
           git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3-lts" && git reset --hard FETCH_HEAD || true
 
@@ -182,8 +183,9 @@ jobs:
         run: sbt "dist/pack" & bash -version
         shell: cmd
 
+      - uses: cygwin/cygwin-install-action@master
       - name: cygwin tests
-        run: '"C:\Program Files\cygwin64\bin\bash" ./project/scripts/winCmdTests'
+        run: '"C:\cygwin\bin\bash" ./project/scripts/winCmdTests'
         shell: cmd
 
       - name: msys tests