Skip to content

Commit 9521429

Browse files
authored
Merge branch 'lampepfl:main' into dotty-scaladoc
2 parents df69511 + e078e79 commit 9521429

File tree

523 files changed

+3890
-7225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

523 files changed

+3890
-7225
lines changed

.github/workflows/ci.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111

112112
- name: Cmd Tests
113113
run: |
114-
./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
114+
./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
115115
./project/scripts/cmdTests
116116
./project/scripts/bootstrappedOnlyCmdTests
117117
@@ -232,6 +232,10 @@ jobs:
232232
git submodule update --init --recursive --jobs 7
233233
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
234234
235+
- name: Show dependency tracking file
236+
if: ${{ always() }}
237+
run: cat community-build/dotty-community-build-deps || true
238+
235239
community_build_b:
236240
runs-on: [self-hosted, Linux]
237241
container:
@@ -275,6 +279,10 @@ jobs:
275279
git submodule update --init --recursive --jobs 7
276280
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
277281
282+
- name: Show dependency tracking file
283+
if: ${{ always() }}
284+
run: cat community-build/dotty-community-build-deps || true
285+
278286
community_build_c:
279287
runs-on: [self-hosted, Linux]
280288
container:
@@ -318,6 +326,10 @@ jobs:
318326
git submodule update --init --recursive --jobs 7
319327
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
320328
329+
- name: Show dependency tracking file
330+
if: ${{ always() }}
331+
run: cat community-build/dotty-community-build-deps || true
332+
321333
community_build_forward_compat:
322334
runs-on: [self-hosted, Linux]
323335
container:
@@ -447,7 +459,7 @@ jobs:
447459

448460
- name: Test
449461
run: |
450-
./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
462+
./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
451463
./project/scripts/cmdTests
452464
./project/scripts/bootstrappedOnlyCmdTests
453465

.github/workflows/scaladoc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
PR_NUMBER: ${{ github.event.pull_request.number }}
6969
with:
7070
inlineScript: |
71-
DOC_DEST=pr-${PR_NUMBER:-${GITHUB_REF##*/}}
71+
DOC_DEST=$(echo pr-${PR_NUMBER:-${GITHUB_REF##*/}} | tr -d -c "[-A-Za-z0-9]")
7272
echo uplading docs to https://scala3doc.virtuslab.com/$DOC_DEST
7373
az storage container create --name $DOC_DEST --account-name scala3docstorage --public-access container
7474
az storage blob upload-batch -s scaladoc/output -d $DOC_DEST --account-name scala3docstorage

.gitignore

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,6 @@ node_modules
3030
.metals/
3131
metals.sbt
3232

33-
# Scala-IDE specific
34-
.scala_dependencies
35-
.cache
36-
.cache-main
37-
.cache-tests
38-
.classpath
39-
.project
40-
.settings
41-
classes/
42-
*/bin/
43-
44-
# Dotty IDE
45-
/.dotty-ide-dev-port
46-
/.dotty-ide-artifact
47-
/.dotty-ide.json
48-
4933
# idea
5034
.idea
5135
.idea_modules
@@ -79,12 +63,9 @@ compiler/test/debug/Gen.jar
7963
compiler/before-pickling.txt
8064
compiler/after-pickling.txt
8165
bench/compile.txt
82-
*.dotty-ide-version
83-
84-
# The vscode app for testing
85-
vscode-dotty/.vscode-test
8666

8767
community-build/scala3-bootstrapped.version
68+
community-build/sbt-injected-plugins
8869
community-build/sbt-dotty-sbt
8970
community-build/sbt-scalajs-sbt
9071
community-build/dotty-community-build-deps

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "community-build/community-projects/algebra"]
2-
path = community-build/community-projects/algebra
3-
url = https://github.com/dotty-staging/algebra
41
[submodule "community-build/community-projects/betterfiles"]
52
path = community-build/community-projects/betterfiles
63
url = https://github.com/dotty-staging/better-files
@@ -250,3 +247,6 @@
250247
[submodule "community-build/community-projects/scalacheck-forward-compat"]
251248
path = community-build/community-projects/scalacheck-forward-compat
252249
url = https://github.com/dotty-staging/scalacheck
250+
[submodule "community-build/community-projects/http4s"]
251+
path = community-build/community-projects/http4s
252+
url = https://github.com/dotty-staging/http4s.git

CONTRIBUTING.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@ This is the process for committing code to the Scala project. There are of cours
1212
2. The ticket has been discussed and prioritized by the team.
1313
3. You should always perform your work in its own Git branch. The branch should be given a descriptive name that explains its intent. Some teams also like adding the ticket number and/or the [GitHub](http://github.com) user ID to the branch name, these details is up to each of the individual teams. (See below for more details on branch naming.)
1414
4. When the feature or fix is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on GitHub.
15-
5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Note that a reviewer can also be an outside contributor—members of Typesafe and independent contributors are encouraged to participate in the review process. It is not a closed process. Please try to avoid conflict of interest—the spirit of the review process is to evenly distribute the understanding of our code base across its maintainers as well as to load balance quality assurance. Assigning a review to a "sure win" reviewer is not a good long-term solution.
15+
5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Note that a reviewer can also be an outside contributor—members of Typesafe or VirtusLab and independent contributors are encouraged to participate in the review process. It is not a closed process. Please try to avoid conflict of interest—the spirit of the review process is to evenly distribute the understanding of our code base across its maintainers as well as to load balance quality assurance. Assigning a review to a "sure win" reviewer is not a good long-term solution.
1616
6. After the review, you should resolve issues brought up by the reviewers as needed (pushing a new commit to address reviewers' comments), iterating until the reviewers give their thumbs up, the "LGTM" (acronym for "Looks Good To Me").
1717
7. Once the code has passed review the Pull Request can be merged into the distribution.
1818

1919
## Pull Request Requirements
2020

21-
First, please have a look at and follow the [Pull Request Policy](https://github.com/scala/scala/wiki/Pull-Request-Policy) for guidelines on submitting a pull request to the dotty project. (the pull request policy is the same as for the Scala programming language)
22-
2321
In order for a Pull Request to be considered, it has to meet these requirements:
2422

2523
1. Live up to the current code standard:
@@ -39,7 +37,7 @@ All contributed code should come accompanied by documentation. Pull requests con
3937

4038
It is ok to work on a public feature branch in the GitHub repository. Something that can sometimes be useful for early feedback etc. If so, then it is preferable to name the branch accordingly. This can be done by either prefixing the name with ``wip-`` as in ‘Work In Progress’, or use hierarchical names like ``wip/..``, ``feature/..`` or ``topic/..``. Either way is fine as long as it is clear that it is work in progress and not ready for merge. This work can temporarily have a lower standard. However, to be merged into master it will have to go through the regular process outlined above, with Pull Request, review etc..
4139

42-
Also, to facilitate both well-formed commits and working together, the ``wip`` and ``feature``/``topic`` identifiers also have special meaning. Any branch labelled with ``wip`` is considered “git-unstable” and may be rebased and have its history rewritten. Any branch with ``feature``/``topic`` in the name is considered “stable” enough for others to depend on when a group is working on a feature.
40+
Also, to facilitate both well-formed commits and working together, the ``wip`` and ``feature``/``topic`` identifiers also have special meaning. Any branch labeled with ``wip`` is considered “git-unstable” and may be rebased and have its history rewritten. Any branch with ``feature``/``topic`` in the name is considered “stable” enough for others to depend on when a group is working on a feature.
4341

4442
## Creating Commits And Writing Commit Messages
4543

@@ -60,4 +58,3 @@ Example:
6058
- Details 1
6159
- Details 2
6260
- Details 3
63-

MAINTENANCE.md

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Issue Tsar Role
2-
This document formally defines the Issue Tsar role. This is a repository maintenance role that is assigned to core contributors on rotating basis.
1+
# Issue Supervisor Role
2+
This document formally defines the _Issue Supervisor_ role. This is a repository maintenance role that is assigned to core contributors on rotating basis.
33

44
## Responsibilities
5-
Issue Tsar is responsible for:
5+
Issue supervisor is responsible for:
66
- Health of the CI, nightly releases and benchmark infrastructure.
77
- PRs of external contributors: assigning someone to review, or handling themselves.
88
- Triaging issues (especially new):
@@ -13,47 +13,48 @@ Issue Tsar is responsible for:
1313
- Attempting to reproduce the issue (or label “stat:cannot reproduce”)
1414
- Further minimizing the issue or asking the reporter of the issue to minimize it correctly (or label “stat:needs minimization”)
1515

16-
Other core teammates are responsible for providing information to the Issue Tsar in a timely manner when it is requested if they have that information.
16+
Other core teammates are responsible for providing information to the issue supervisor in a timely manner when it is requested if they have that information.
1717

1818
## Assignment
19-
Issue Tsar is appointed for 7 days and is responsible for what is specified in the “Responsibilities” section during those 7 days. Their assumption of the role starts from the Dotty Meeting on Monday and ends on the next Dotty Meeting on Monday.
19+
Issue supervisor is appointed for 7 days and is responsible for what is specified in the “Responsibilities” section during those 7 days. Their assumption of the role starts from the Dotty Meeting on Monday and ends on the next Dotty Meeting on Monday.
2020

21-
During the Dotty Meeting, an Issue Tsar is assigned for the current week and for the week after that.
21+
During the Dotty Meeting, an issue supervisor is assigned for the current week and for the week after that.
2222

23-
Issue Tsardom schedule is maintained in the [Issue Tsardom Statistics spreadsheet](https://docs.google.com/spreadsheets/d/19IAqNzHfJ9rsii3EsjIGwPz5BLTFJs_byGM3FprmX3E/edit?usp=sharing). So, someone who knows their availability several weeks ahead into the future can assign themselves to be an issue tsar well ahead of time.
23+
Issue supervisor schedule is maintained in the [Issue Supervisor Statistics spreadsheet](https://docs.google.com/spreadsheets/d/19IAqNzHfJ9rsii3EsjIGwPz5BLTFJs_byGM3FprmX3E/edit?usp=sharing). So, someone who knows their availability several weeks ahead into the future can assign themselves to be an issue supervisor well ahead of time.
2424

2525
## Prerequisites
26-
An issue tsar needs to have all the accesses and privileges required to get their job done. This might include:
26+
An issue supervisor needs to have all the accesses and privileges required to get their job done. This might include:
2727
- Admin rights in lampepfl/dotty repository
2828
- Admin rights in lampepfl/dotty-feature-requests repository
2929
- Permissions to create new repositories in lampepfl organization (needed to fork repositories for the community build)
3030
- Access to the LAMP slack to be able to ask for help with the infrastructure, triaging and such
3131

3232
## Procedures
33-
To ensure proper health of the infrastructure, the Tsar regularly monitors its proper operation. If a malfunction is detected, the Tsar's job is to ensure that someone is working on it (or solve it on their own).
33+
To ensure proper health of the infrastructure, the supervisor regularly monitors its proper operation. If a malfunction is detected, the supervisor's job is to ensure that someone is working on it (or solve it on their own).
3434

35-
If it is unclear what area an issue belongs to, the Tsar asks for advice from other team members on Slack or GitHub. If, after asking for advice, it turns out that nobody in the team knows how to classify it, the issue must be classified with a “stat:needs triage” label.
35+
If it is unclear what area an issue belongs to, the supervisor asks for advice from other team members on Slack or GitHub. If, after asking for advice, it turns out that nobody in the team knows how to classify it, the issue must be classified with a “stat:needs triage” label.
3636

37-
If it is unclear who should review an external PR, the Tsar asks for advice from the rest of the core team. If after asking for advice, it is still unclear who should do it, the reviewer for such a PR will be decided at the next Dotty meeting.
37+
If it is unclear who should review an external PR, the supervisor asks for advice from the rest of the core team. If after asking for advice, it is still unclear who should do it, the reviewer for such a PR will be decided at the next Dotty meeting.
3838

39-
In general, if anything else is unclear for proper fulfillment of responsibilities, the Tsar must proactively seek advice from other team members on Slack or other channels.
39+
In general, if anything else is unclear for proper fulfillment of responsibilities, the supervisor must proactively seek advice from other team members on Slack or other channels.
4040

4141
## Reporting
42-
At the end of their Tsardom, the Tsar reports to the team during the Dotty meeting on the following points:
42+
At the end of their supervision period, the supervisor reports to the team during the Dotty meeting on the following points:
4343

4444
- Whether there were any incidents with the CI, nightlies and benchmarks, how they were resolved and what steps were taken to prevent them from happening in the future.
4545
- How many new external contributors’ PRs were there and what they were about (in brief).
46-
- How many new issues were opened during their Tsardom period? Were there any areas that got a lot of issues? How many regressions from a prior Scala 3 release were there? Which were designated for an MSc project or an Issue Spree?
47-
- If new labels were created or old ones were removed, or there is any other feedback on how to improve the Tsardom, mention that.
46+
- How many new issues were opened during their supervision period? Were there any areas that got a lot of issues? How many regressions from a prior Scala 3 release were there? Which were designated for an MSc project or an Issue Spree?
47+
- If new labels were created or old ones were removed, or there is any other feedback on how to improve the issue supervision, mention that.
4848
- Unassigned PRs and issues that the team failed to classify: bring them one by one so that the team can make a decision on them.
4949

5050
# Maintenance List
51-
The following is the list of all the principal areas of the compiler and the core teams members who are responsible for their maintenance:
51+
The following is the list of all the principal areas of the compiler and the core team members who are responsible for their maintenance:
5252

53+
- Parser: @odersky
5354
- Typer: @odersky, @smarter, (@dwijnand)
5455
- Erasure: @smarter, @odersky
5556
- Enums: @bishabosha
56-
- Export: @bishabosha, @odersky
57+
- Export: @bishabosha, @odersky
5758
- Pattern Matching: @dwijnand, (@liufengyun), @sjrd
5859
- Inline: @nicolasstucki, @odersky
5960
- Metaprogramming (Quotes, Reflect, Staging): @nicolasstucki, @aherlihy

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ Dotty
33
[![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amain)
44
[![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://discord.com/invite/scala)
55

6-
* [Homepage](https://dotty.epfl.ch)
7-
* [Documentation](https://dotty.epfl.ch/docs)
6+
* [Documentation](https://docs.scala-lang.org/scala3/)
87

98
Try it out
109
==========
11-
To try it in your project see also the [Getting Started User Guide](https://dotty.epfl.ch/#getting-started).
10+
To try it in your project see also the [Getting Started User Guide](https://docs.scala-lang.org/scala3/getting-started.html).
1211

1312
Building a Local Distribution
1413
=============================
@@ -23,7 +22,7 @@ other more direct lines of communication such as email.
2322

2423
How to Contribute
2524
=================
26-
* [Getting Started as Contributor](https://dotty.epfl.ch/docs/contributing/getting-started.html)
25+
* [Getting Started as Contributor](https://docs.scala-lang.org/scala3/guides/contribution/contribution-intro.html)
2726
* [Issues](https://github.com/lampepfl/dotty/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
2827

2928
License

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ val sjsJUnitTests = Build.sjsJUnitTests
3333
val sjsCompilerTests = Build.sjsCompilerTests
3434

3535
val `sbt-test` = Build.`sbt-test`
36-
val `vscode-dotty` = Build.`vscode-dotty`
3736

3837
inThisBuild(Build.thisBuildSettings)
3938
inScope(Global)(Build.globalSettings)
Submodule AsyncFile updated 28 files

0 commit comments

Comments
 (0)