Skip to content

Commit 9fe0047

Browse files
tanishikingtanishiking
committed
Merge branch 'main' into type-lambda
2 parents 399f229 + d577300 commit 9fe0047

File tree

2,314 files changed

+228275
-15373
lines changed

Some content is hidden

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

2,314 files changed

+228275
-15373
lines changed

‎.github/PULL_REQUEST_TEMPLATE/fix-issue.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ assignees: ''
66

77
---
88

9-
<!--
10-
TODO first sign the CLA
9+
<!--
10+
TODO first sign the CLA
1111
https://www.lightbend.com/contribute/cla/scala
1212
-->
1313

1414
## Fix #XYZ
1515

16-
<!-- TODO description of the change -->
16+
<!-- TODO description of the change -->
1717

1818

1919
<!-- Ideally should have a called "Fix #XYZ: A SHORT FIX DESCRIPTION" -->

‎.github/PULL_REQUEST_TEMPLATE/other-pr.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ assignees: ''
66

77
---
88

9-
<!--
10-
TODO first sign the CLA
9+
<!--
10+
TODO first sign the CLA
1111
https://www.lightbend.com/contribute/cla/scala
1212
-->
1313

1414
## Description
1515

16-
<!-- TODO description of the change -->
16+
<!-- TODO description of the change -->
1717

1818

1919
<!-- Ideally should have a single commit -->

‎.github/workflows/ci.yaml

Lines changed: 25 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,24 @@ name: Dotty
22

33
on:
44
push:
5-
branches-ignore:
6-
- 'language-reference-stable'
5+
## Be careful if you add or remove something here! Quoting from
6+
## <https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onpushbranchestagsbranches-ignoretags-ignore>:
7+
##
8+
## > If you define only tags/tags-ignore or only branches/branches-ignore, the
9+
## > workflow won't run for events affecting the undefined Git ref. If you
10+
## > define neither tags/tags-ignore or branches/branches-ignore, the workflow
11+
## > will run for events affecting either branches or tags.
12+
##
13+
## We want the CI to run on both branches and tags, so we should either have:
14+
## - both (tags or tags-ignore) and (branches or branches-ignore),
15+
## - or neither of them.
16+
## But it's important to not have only one or the other.
717
tags:
8-
- '**'
9-
pull_request:
18+
- '*'
1019
branches-ignore:
11-
- 'language-reference-stable'
20+
- 'gh-readonly-queue/**'
21+
pull_request:
22+
merge_group:
1223
schedule:
1324
- cron: '0 3 * * *' # Every day at 3 AM
1425
workflow_dispatch:
@@ -91,6 +102,7 @@ jobs:
91102
- ${{ github.workspace }}/../../cache/general:/root/.cache
92103
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
93104
|| github.event_name == 'push'
105+
|| github.event_name == 'merge_group'
94106
|| (
95107
github.event_name == 'pull_request'
96108
&& !contains(github.event.pull_request.body, '[skip ci]')
@@ -136,6 +148,7 @@ jobs:
136148
github.event_name == 'push'
137149
&& github.ref != 'refs/heads/main'
138150
)
151+
|| github.event_name == 'merge_group'
139152
|| (
140153
github.event_name == 'pull_request'
141154
&& !contains(github.event.pull_request.body, '[skip ci]')
@@ -212,6 +225,7 @@ jobs:
212225
- ${{ github.workspace }}/../../cache/general:/root/.cache
213226
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
214227
|| github.event_name == 'push'
228+
|| github.event_name == 'merge_group'
215229
|| (
216230
github.event_name == 'pull_request'
217231
&& !contains(github.event.pull_request.body, '[skip ci]')
@@ -252,10 +266,12 @@ jobs:
252266
- ${{ github.workspace }}/../../cache/general:/root/.cache
253267
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
254268
|| github.event_name == 'push'
269+
|| github.event_name == 'merge_group'
255270
|| (
256271
github.event_name == 'pull_request'
257272
&& !contains(github.event.pull_request.body, '[skip ci]')
258273
&& !contains(github.event.pull_request.body, '[skip community_build]')
274+
&& !contains(github.event.pull_request.body, '[skip community_build_a]')
259275
)
260276
|| (
261277
github.event_name == 'workflow_dispatch'
@@ -299,10 +315,12 @@ jobs:
299315
- ${{ github.workspace }}/../../cache/general:/root/.cache
300316
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
301317
|| github.event_name == 'push'
318+
|| github.event_name == 'merge_group'
302319
|| (
303320
github.event_name == 'pull_request'
304321
&& !contains(github.event.pull_request.body, '[skip ci]')
305322
&& !contains(github.event.pull_request.body, '[skip community_build]')
323+
&& !contains(github.event.pull_request.body, '[skip community_build_b]')
306324
)
307325
|| (
308326
github.event_name == 'workflow_dispatch'
@@ -346,10 +364,12 @@ jobs:
346364
- ${{ github.workspace }}/../../cache/general:/root/.cache
347365
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
348366
|| github.event_name == 'push'
367+
|| github.event_name == 'merge_group'
349368
|| (
350369
github.event_name == 'pull_request'
351370
&& !contains(github.event.pull_request.body, '[skip ci]')
352371
&& !contains(github.event.pull_request.body, '[skip community_build]')
372+
&& !contains(github.event.pull_request.body, '[skip community_build_c]')
353373
)
354374
|| (
355375
github.event_name == 'workflow_dispatch'
@@ -576,45 +596,6 @@ jobs:
576596
external_repository: lampepfl/dotty-website
577597
publish_branch: gh-pages
578598

579-
nightly_unmanaged_community_build:
580-
# Self-hosted runner is used only for getting current build version
581-
runs-on: [self-hosted, Linux]
582-
container:
583-
image: lampepfl/dotty:2021-03-22
584-
options: --cpu-shares 4096
585-
volumes:
586-
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
587-
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
588-
- ${{ github.workspace }}/../../cache/general:/root/.cache
589-
needs: [publish_nightly]
590-
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
591-
env:
592-
NIGHTLYBUILD: yes
593-
steps:
594-
- name: Reset existing repo
595-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
596-
597-
- name: Checkout cleanup script
598-
uses: actions/checkout@v3
599-
600-
- name: Cleanup
601-
run: .github/workflows/cleanup.sh
602-
603-
- name: Git Checkout
604-
uses: actions/checkout@v3
605-
606-
- name: Add SBT proxy repositories
607-
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
608-
609-
- name: Get version string for this build
610-
run: |
611-
ver=$(./project/scripts/sbt "print scala3-compiler-bootstrapped/version" | tail -n1)
612-
echo "This build version: $ver"
613-
echo "THISBUILD_VERSION=$ver" >> $GITHUB_ENV
614-
# Steps above are copy-pasted from publish_nightly, needed only to resolve THISBUILD_VERSION
615-
- name: Trigger unmanaged community build
616-
run: .github/workflows/scripts/triggerUnmanagedCommunityBuild.sh "${{ secrets.BUILD_TOKEN }}" "$THISBUILD_VERSION"
617-
618599
publish_release:
619600
permissions:
620601
contents: write # for actions/create-release to create a release

‎.github/workflows/cla.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
name: Scala CLA
22
on:
33
pull_request:
4+
branches-ignore:
5+
- 'language-reference-stable'
46
push:
57
branches:
6-
- 'language-reference-backport'
8+
- 'language-reference-stable'
9+
merge_group:
710
permissions:
811
contents: write
912
pull-requests: write

‎.github/workflows/language-reference.yaml

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: language-reference-documentation
1+
name: Language reference documentation
22

33
on:
44
push:
@@ -14,14 +14,14 @@ permissions:
1414

1515
jobs:
1616
build-and-push:
17+
name: Build reference documentation and push it
1718
permissions:
1819
contents: write # for Git to git push
19-
pull-requests: write # for peter-evans/create-pull-request to create a PR
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Get current date
2323
id: date
24-
run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
24+
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
2525

2626
- name: Git Checkout
2727
uses: actions/checkout@v3
@@ -67,26 +67,22 @@ jobs:
6767
fi
6868
cd ..
6969
70-
- name: Merge changes to main
71-
if: github.event_name == 'push'
72-
run: |
73-
cd dotty
74-
git fetch origin main:main
75-
git checkout main
76-
git config user.name gh-actions
77-
git config user.email [email protected]
78-
git merge language-reference-stable
79-
cd ..
80-
81-
- name: Create pull request with backport to main
82-
if: github.event_name == 'push'
83-
uses: peter-evans/create-pull-request@v4
70+
backport-to-main:
71+
name: Create pull request with backport to main
72+
permissions:
73+
pull-requests: write # for repo-sync/pull-request to create a PR
74+
runs-on: ubuntu-latest
75+
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
76+
steps:
77+
- uses: actions/checkout@v3
78+
- uses: repo-sync/pull-request@v2
8479
with:
85-
path: dotty
86-
branch: language-reference-backport
87-
labels: area:documentation
88-
title: Backport changes from stable documentation branch
89-
body: This pull request is created automatically after push to stable documentation branch and backports the changes
90-
reviewers: pikinier20,julienrf
91-
assignees: pikinier20
80+
destination_branch: main
81+
pr_label: area:documentation
82+
pr_title: Sync with the stable documentation branch
83+
pr_body: |
84+
This pull request is syncing the main with changes from language-reference-stable.
85+
86+
It was created automatically after ${{ github.event.head_commit.id }} by @${{ github.event.head_commit.author.username }}
87+
pr_assignee: ${{ github.event.head_commit.author.username }}
9288

‎.github/workflows/releases.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
options: --cpu-shares 4096
1414

1515
env:
16-
SDKMAN_KEY: ${{ secrets.SDKMAN_KEY }}
16+
SDKMAN_KEY: ${{ secrets.SDKMAN_KEY }}
1717
SDKMAN_TOKEN: ${{ secrets.SDKMAN_TOKEN }}
18-
18+
1919
steps:
2020
- name: Reset existing repo
2121
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true

‎.github/workflows/scripts/publish-sdkman.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
set -u
1111

12-
# latest stable dotty version
12+
# latest stable dotty version
1313
DOTTY_VERSION=$(curl -s https://api.github.com/repos/lampepfl/dotty/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
1414
DOTTY_URL="https://github.com/lampepfl/dotty/releases/download/$DOTTY_VERSION/scala3-$DOTTY_VERSION.zip"
1515

16-
# checking if dotty version is available
16+
# checking if dotty version is available
1717
if ! curl --output /dev/null --silent --head --fail "$DOTTY_URL"; then
1818
echo "URL doesn't exist: $DOTTY_URL"
1919
exit 1

‎.github/workflows/scripts/triggerUnmanagedCommunityBuild.sh

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ metals.sbt
3535
.idea_modules
3636
/.worksheet/
3737

38+
# scala-cli
39+
.scala-build
40+
3841
# Partest
3942
dotty.jar
4043
dotty-lib.jar
@@ -90,3 +93,5 @@ compiler/test-coursier/run/*.jar
9093
# docs related
9194
contributors.js
9295
content-contributors.css
96+
docs/_spec/_site/
97+
docs/_spec/.jekyll-metadata

0 commit comments

Comments
 (0)