Merge branch 'main' into 18234

Author: fernandofpd

.github/workflows/ci.yaml

@@ -134,7 +134,7 @@ jobs:
 
  - name: Cmd Tests
 run: |
- ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped-tasty-tests/run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
+ ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;scala2-library-tasty-tests/run ;scala2-library-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
  ./project/scripts/cmdTests
  ./project/scripts/bootstrappedOnlyCmdTests
 
@@ -253,12 +253,12 @@ jobs:
 
  - name: MiMa
 run: |
- ./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues; stdlib-bootstrapped/mimaReportBinaryIssues"
+ ./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues; scala2-library-bootstrapped/mimaReportBinaryIssues"
 
  - name: TASTy MiMa
 run: |
  # This script cleans the compiler and recompiles it from scratch (keep as last run)
- ./project/scripts/stdlib-bootstrapped-tasty-mima.sh
+ ./project/scripts/scala2-library-tasty-mima.sh
 
 community_build_a:
 runs-on: [self-hosted, Linux]
@@ -493,7 +493,7 @@ jobs:
 
  - name: Test
 run: |
- ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped-tasty-tests/run ;stdlib-bootstrapped-tasty-tests/test"
+ ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;scala2-library-tasty-tests/run ;scala2-library-tasty-tests/test"
  ./project/scripts/cmdTests
  ./project/scripts/bootstrappedOnlyCmdTests
 

.github/workflows/spec.yml

@@ -0,0 +1,55 @@
+name: Specification
+
+on:
+push:
+tags:
+ - '*'
+branches-ignore:
+ - 'gh-readonly-queue/**'
+pull_request:
+merge_group:
+workflow_dispatch:
+
+env:
+DOTTY_CI_RUN: true
+
+jobs:
+specification:
+runs-on: ubuntu-latest
+defaults:
+run:
+working-directory: ./docs/_spec
+
+steps:
+ - uses: actions/checkout@v3
+
+# Keep in sync with ./docs/_spec/Dockerfile
+ - uses: ruby/setup-ruby@v1
+with:
+ruby-version: '2.7'
+ - name: Install required gems
+run: |
+ gem update --system
+ gem install sass-embedded -v 1.58.0
+ gem install bundler:1.17.2 jekyll
+ bundle install
+ npm install bower
+
+ - name: Build the specification
+run: |
+ bundle exec jekyll build
+
+# Deploy
+ - name: Deployment
+env:
+USER_FOR_TEST: ${{secrets.SPEC_DEPLOY_USER }}
+if: ${{env.USER_FOR_TEST != ''}}
+uses: burnett01/[email protected]
+with:
+switches: -rzv
+path: docs/_spec/_site/
+remote_path: ${{secrets.SPEC_DEPLOY_PATH }}
+remote_host: ${{secrets.SPEC_DEPLOY_HOST }}
+remote_user: ${{secrets.SPEC_DEPLOY_USER }}
+remote_key: ${{secrets.SPEC_DEPLOY_KEY }}
+remote_key_pass: ${{secrets.SPEC_DEPLOY_PASS }}

bench-run/src/main/scala/dotty/tools/benchmarks/Main.scala

@@ -68,7 +68,7 @@ object Bench{
  println()
  println("Usage:")
  println()
- println("dotty-bench-run/jmh:run [<warmup>] [<iterations>] [<forks>] <regexp> [<input>|--] [<output>]")
+ println("scala3-bench-run/jmh:run [<warmup>] [<iterations>] [<forks>] <regexp> [<input>|--] [<output>]")
  println()
  println("warmup: warmup iterations. defaults to 20.")
  println("iterations: benchmark iterations. defaults to 20.")

bench/scripts/collection-vector.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-sbt "dotty-bench-bootstrapped/jmh:run 40 40 3 bench/tests/Vector.scala"
+sbt "scala3-bench-bootstrapped/jmh:run 40 40 3 bench/tests/Vector.scala"

bench/scripts/compiler-cold.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-find compiler/src/ -type f \( -name "*.scala" -or -name "*.java"\) -exec echo"dotty-bench-bootstrapped/jmh:run 0 1 10"{} + | sbt
+find compiler/src/ -type f \( -name "*.scala" -or -name "*.java"\) -exec echo"scala3-bench-bootstrapped/jmh:run 0 1 10"{} + | sbt

bench/scripts/compiler.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-find compiler/src/ -type f \( -name "*.scala" -or -name "*.java"\) -exec echo"dotty-bench-bootstrapped/jmh:run 5 10"{} + | sbt
+find compiler/src/ -type f \( -name "*.scala" -or -name "*.java"\) -exec echo"scala3-bench-bootstrapped/jmh:run 5 10"{} + | sbt

bench/scripts/library-cold.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-find library/src/ -type f \( -name "*.scala" -or -name "*.java"\) -exec echo"dotty-bench-bootstrapped/jmh:run 0 1 10"{} + | sbt
+find library/src/ -type f \( -name "*.scala" -or -name "*.java"\) -exec echo"scala3-bench-bootstrapped/jmh:run 0 1 10"{} + | sbt

bench/scripts/library.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-find library/src/ -type f \( -name "*.scala" -or -name "*.java"\) -exec echo"dotty-bench-bootstrapped/jmh:run 40 30"{} + | sbt
+find library/src/ -type f \( -name "*.scala" -or -name "*.java"\) -exec echo"scala3-bench-bootstrapped/jmh:run 40 30"{} + | sbt

build.sbt

@@ -14,9 +14,9 @@ val `scala3-language-server` = Build.`scala3-language-server`
 val`scala3-bench`=Build.`scala3-bench`
 val`scala3-bench-bootstrapped`=Build.`scala3-bench-bootstrapped`
 val`scala3-bench-micro`=Build.`scala3-bench-micro`
-val`stdlib-bootstrapped`=Build.`stdlib-bootstrapped`
-val`stdlib-bootstrapped-tasty`=Build.`stdlib-bootstrapped-tasty`
-val`stdlib-bootstrapped-tasty-tests`=Build.`stdlib-bootstrapped-tasty-tests`
+val`scala2-library-bootstrapped`=Build.`scala2-library-bootstrapped`
+val`scala2-library-tasty`=Build.`scala2-library-tasty`
+val`scala2-library-tasty-tests`=Build.`scala2-library-tasty-tests`
 val`tasty-core`=Build.`tasty-core`
 val`tasty-core-bootstrapped`=Build.`tasty-core-bootstrapped`
 val`tasty-core-scala2`=Build.`tasty-core-scala2`