diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9cd0f0b3899c..b4cf13494616 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 @@ -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 @@ -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 @@ -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 @@ -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' @@ -168,8 +168,9 @@ 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 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 - name: Git Checkout uses: actions/checkout@v4 @@ -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 @@ -199,7 +201,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' || ( @@ -212,8 +214,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 @@ -228,7 +230,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 @@ -254,8 +256,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 @@ -274,7 +276,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 @@ -301,8 +303,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 +320,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" @@ -328,7 +330,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 @@ -355,8 +357,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 +374,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" @@ -382,7 +384,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 @@ -409,8 +411,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 +428,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" @@ -436,7 +438,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 @@ -462,8 +464,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 @@ -481,7 +483,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 @@ -511,8 +513,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 @@ -537,7 +539,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 @@ -559,8 +561,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 @@ -600,7 +602,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 @@ -623,8 +625,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 +642,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 @@ -654,7 +656,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 @@ -678,8 +680,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 @@ -756,7 +758,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] 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"