From bb90d857a95964312b2652ab5f5f71afcf3023ff Mon Sep 17 00:00:00 2001 From: Hamza REMMAL Date: Fri, 1 Mar 2024 13:38:27 +0100 Subject: [PATCH] Adapt for scala/scala3 --- .github/workflows/ci.yaml | 108 +++++++++++++++---------------- project/Build.scala | 16 ++--- project/scripts/cmdScaladocTests | 6 +- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a51f7337017e..80960212f8c1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: - ${{ 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 == 'lampepfl/dotty' + if: "github.event_name == 'schedule' && github.repository == 'scala/scala3' || github.event_name == 'push' || ( github.event_name == 'pull_request' @@ -62,17 +62,17 @@ jobs: ) || ( github.event_name == 'workflow_dispatch' - && github.repository == 'lampepfl/dotty' + && 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/lampepfl/dotty/pull/19720) + ## 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/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 @@ -105,7 +105,7 @@ jobs: - ${{ 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 == 'lampepfl/dotty' + if: "github.event_name == 'schedule' && github.repository == 'scala/scala3' || github.event_name == 'push' || github.event_name == 'merge_group' || ( @@ -115,7 +115,7 @@ jobs: ) || ( github.event_name == 'workflow_dispatch' - && github.repository == 'lampepfl/dotty' + && github.repository == 'scala/scala3' )" steps: @@ -124,8 +124,8 @@ jobs: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 @@ -164,14 +164,14 @@ jobs: - ${{ 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 == 'lampepfl/dotty' + if: "github.event_name == 'schedule' && github.repository == 'scala/scala3' || ( github.event_name == 'pull_request' && contains(github.event.pull_request.body, '[test_scala2_library_tasty]') ) || ( github.event_name == 'workflow_dispatch' - && github.repository == 'lampepfl/dotty' + && github.repository == 'scala/scala3' )" steps: @@ -180,8 +180,8 @@ jobs: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 @@ -220,8 +220,8 @@ jobs: - name: Reset existing repo shell: cmd run: | - git config --global --add safe.directory /__w/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Git Checkout uses: actions/checkout@v4 @@ -252,7 +252,7 @@ jobs: test_windows_full: runs-on: [self-hosted, Windows] - if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty' + if: "github.event_name == 'schedule' && github.repository == 'scala/scala3' || github.event_name == 'push' || ( github.event_name == 'pull_request' @@ -264,8 +264,8 @@ jobs: - name: Reset existing repo shell: cmd run: | - git config --global --add safe.directory /__w/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Git Checkout uses: actions/checkout@v4 @@ -288,7 +288,7 @@ jobs: - ${{ 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 == 'lampepfl/dotty' + if: "github.event_name == 'schedule' && github.repository == 'scala/scala3' || github.event_name == 'push' || github.event_name == 'merge_group' || ( @@ -298,7 +298,7 @@ jobs: ) || ( github.event_name == 'workflow_dispatch' - && github.repository == 'lampepfl/dotty' + && github.repository == 'scala/scala3' )" steps: - name: Set JDK 17 as default @@ -306,8 +306,8 @@ jobs: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 @@ -339,7 +339,7 @@ jobs: - ${{ 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 == 'lampepfl/dotty' + if: "github.event_name == 'schedule' && github.repository == 'scala/scala3' || github.event_name == 'push' || github.event_name == 'merge_group' || ( @@ -350,7 +350,7 @@ jobs: ) || ( github.event_name == 'workflow_dispatch' - && github.repository == 'lampepfl/dotty' + && github.repository == 'scala/scala3' )" steps: @@ -358,8 +358,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/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 @@ -375,7 +375,7 @@ jobs: - name: Test run: | - git config --global --add safe.directory /__w/dotty/dotty + git config --global --add safe.directory /__w/scala3/scala3 git submodule sync git submodule update --init --recursive --jobs 7 ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA" @@ -393,7 +393,7 @@ jobs: - ${{ 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 == 'lampepfl/dotty' + if: "github.event_name == 'schedule' && github.repository == 'scala/scala3' || github.event_name == 'push' || github.event_name == 'merge_group' || ( @@ -404,7 +404,7 @@ jobs: ) || ( github.event_name == 'workflow_dispatch' - && github.repository == 'lampepfl/dotty' + && github.repository == 'scala/scala3' )" steps: @@ -412,8 +412,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/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 @@ -429,7 +429,7 @@ jobs: - name: Test run: | - git config --global --add safe.directory /__w/dotty/dotty + git config --global --add safe.directory /__w/scala3/scala3 git submodule sync git submodule update --init --recursive --jobs 7 ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB" @@ -447,7 +447,7 @@ jobs: - ${{ 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 == 'lampepfl/dotty' + if: "github.event_name == 'schedule' && github.repository == 'scala/scala3' || github.event_name == 'push' || github.event_name == 'merge_group' || ( @@ -458,7 +458,7 @@ jobs: ) || ( github.event_name == 'workflow_dispatch' - && github.repository == 'lampepfl/dotty' + && github.repository == 'scala/scala3' )" steps: @@ -466,8 +466,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/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 @@ -483,7 +483,7 @@ jobs: - name: Test run: | - git config --global --add safe.directory /__w/dotty/dotty + git config --global --add safe.directory /__w/scala3/scala3 git submodule sync git submodule update --init --recursive --jobs 7 ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC" @@ -501,7 +501,7 @@ jobs: - ${{ 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 == 'lampepfl/dotty' + if: "github.event_name == 'schedule' && github.repository == 'scala/scala3' || github.event_name == 'push' || ( github.event_name == 'pull_request' @@ -510,7 +510,7 @@ jobs: ) || ( github.event_name == 'workflow_dispatch' - && github.repository == 'lampepfl/dotty' + && github.repository == 'scala/scala3' )" steps: @@ -519,8 +519,8 @@ jobs: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 @@ -547,7 +547,7 @@ jobs: - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache - ${{ github.workspace }}/../../cache/general:/root/.cache - if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty' + if: "github.event_name == 'schedule' && github.repository == 'scala/scala3' || ( github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/') @@ -559,7 +559,7 @@ jobs: ) || ( github.event_name == 'workflow_dispatch' - && github.repository == 'lampepfl/dotty' + && github.repository == 'scala/scala3' )" steps: @@ -568,8 +568,8 @@ jobs: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 @@ -603,7 +603,7 @@ jobs: - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache - ${{ github.workspace }}/../../cache/general:/root/.cache needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, test_sbt, test_java8] - if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'" + if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'scala/scala3'" env: NIGHTLYBUILD: yes PGP_PW: ${{ secrets.PGP_PW }} # PGP passphrase @@ -616,8 +616,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/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 @@ -658,7 +658,7 @@ jobs: - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache - ${{ github.workspace }}/../../cache/general:/root/.cache needs: [publish_nightly] - if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'" + if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'scala/scala3'" env: NIGHTLYBUILD: yes DOTTY_WEBSITE_BOT_TOKEN: ${{ secrets.BOT_TOKEN }} # If you need to change this: @@ -672,8 +672,8 @@ jobs: steps: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 @@ -689,7 +689,7 @@ jobs: - name: Generate Website run: | - git config --global --add safe.directory /__w/dotty/dotty + git config --global --add safe.directory /__w/scala3/scala3 ./project/scripts/genDocs -doc-snapshot - name: Deploy Website to dotty-website @@ -727,8 +727,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/dotty/dotty - git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + 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 - name: Checkout cleanup script uses: actions/checkout@v4 diff --git a/project/Build.scala b/project/Build.scala index 172290630599..ba6fe5a555fd 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -140,8 +140,8 @@ object Build { val stdlibBootstrappedVersion = "2.13.12" val dottyOrganization = "org.scala-lang" - val dottyGithubUrl = "https://github.com/lampepfl/dotty" - val dottyGithubRawUserContentUrl = "https://raw.githubusercontent.com/lampepfl/dotty" + val dottyGithubUrl = "https://github.com/scala/scala3" + val dottyGithubRawUserContentUrl = "https://raw.githubusercontent.com/scala/scala3" val isRelease = sys.env.get("RELEASEBUILD") == Some("yes") @@ -379,7 +379,7 @@ object Build { "-skip-by-regex:.+\\.impl($|\\..+)", "-project-logo", "docs/_assets/images/logo.svg", "-social-links:" + - "github::https://github.com/lampepfl/dotty," + + "github::https://github.com/scala/scala3," + "discord::https://discord.com/invite/scala," + "twitter::https://twitter.com/scala_lang", // contains special definitions which are "transplanted" elsewhere @@ -1859,7 +1859,7 @@ object Build { .add(ProjectVersion(baseVersion)) .remove[VersionsDictionaryUrl] .add(SourceLinks(List( - s"${temp.getAbsolutePath}=github://lampepfl/dotty/language-reference-stable" + s"${temp.getAbsolutePath}=github://scala/scala3/language-reference-stable" ))) .withTargets(List("___fake___.scala")) } @@ -2027,7 +2027,7 @@ object Build { scmInfo := Some( ScmInfo( url(dottyGithubUrl), - "scm:git:git@github.com:lampepfl/dotty.git" + "scm:git:git@github.com:scala/scala3.git" ) ), developers := List( @@ -2262,7 +2262,7 @@ object ScaladocConfigs { sys.env.get("GITHUB_SHA") match { case Some(sha) => s"${sourcesPrefix}github://${sys.env("GITHUB_REPOSITORY")}/$sha$outputPrefix" - case None => s"${sourcesPrefix}github://lampepfl/dotty/$v$outputPrefix" + case None => s"${sourcesPrefix}github://scala/scala3/$v$outputPrefix" } def defaultSourceLinks(version: String = dottyNonBootstrappedVersion, refVersion: String = dottyVersion) = Def.task { @@ -2273,7 +2273,7 @@ object ScaladocConfigs { scalaSrcLink(stdLibVersion, srcManaged(version, "scala") + "="), dottySrcLink(refVersion, "library/src=", "#library/src"), dottySrcLink(refVersion), - "docs=github://lampepfl/dotty/main#docs" + "docs=github://scala/scala3/main#docs" ) ) } @@ -2281,7 +2281,7 @@ object ScaladocConfigs { lazy val DefaultGenerationSettings = Def.task { def projectVersion = version.value def socialLinks = SocialLinks(List( - "github::https://github.com/lampepfl/dotty", + "github::https://github.com/scala/scala3", "discord::https://discord.com/invite/scala", "twitter::https://twitter.com/scala_lang", )) diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index e9403d988b98..06353af693f1 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="lampepfl/dotty" +SOURCE_LINKS_REPOSITORY="scala/scala3" SOURCE_LINKS_VERSION="${GITHUB_SHA:-$DOTTY_BOOTSTRAPPED_VERSION}" "$SBT" "scaladoc/generateTestcasesDocumentation" > "$tmp" 2>&1 || echo "generated testcases project with sbt" @@ -30,7 +30,7 @@ dist/target/pack/bin/scaladoc \ "-skip-by-regex:.+\.internal($|\..+)" \ "-skip-by-regex:.+\.impl($|\..+)" \ -project-logo docs/_assets/images/logo.svg \ - -social-links:github::https://github.com/lampepfl/dotty,discord::https://discord.com/invite/scala,twitter::https://twitter.com/scala_lang \ + -social-links:github::https://github.com/scala/scala3,discord::https://discord.com/invite/scala,twitter::https://twitter.com/scala_lang \ -Ygenerate-inkuire \ "-skip-by-id:scala.runtime.stdLibPatches" \ "-skip-by-id:scala.runtime.MatchCase" \ @@ -42,4 +42,4 @@ dist/target/pack/bin/scaladoc \ -author -groups -revision main -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \ "-quick-links:Learn::https://docs.scala-lang.org/,Install::https://www.scala-lang.org/download/,Playground::https://scastie.scala-lang.org,Find A Library::https://index.scala-lang.org,Community::https://www.scala-lang.org/community/,Blog::https://www.scala-lang.org/blog/," \ out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts" -diff -rq "$OUT1" "scaladoc/output/testcases" +diff -r "$OUT1" "scaladoc/output/testcases"