Skip to content

Commit e9ca0a4

Browse files
Merge pull request #14402 from dotty-staging/rename-master-branch-migration
Rename master branch to main: migration of the infrastructure
2 parents 1130c52 + 82aad8b commit e9ca0a4

36 files changed

+75
-75
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
runs-on: [self-hosted, Windows]
123123
if: "(
124124
github.event_name == 'push'
125-
&& github.ref != 'refs/heads/master'
125+
&& github.ref != 'refs/heads/main'
126126
)
127127
|| (
128128
github.event_name == 'pull_request'

.github/workflows/scaladoc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
&& !contains(github.event.pull_request.body, '[skip docs]')
1414
)
1515
|| contains(github.event.ref, 'scaladoc')
16-
|| contains(github.event.ref, 'master')"
16+
|| contains(github.event.ref, 'main')"
1717

1818
steps:
1919
- name: Git Checkout
@@ -82,7 +82,7 @@ jobs:
8282
)
8383
|| contains(github.event.ref, 'scaladoc')
8484
|| contains(github.event.ref, 'scala3doc')
85-
|| contains(github.event.ref, 'master'))"
85+
|| contains(github.event.ref, 'main'))"
8686

8787
steps:
8888
- name: Git Checkout

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Dotty
22
=====
3-
[![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster)
3+
[![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

66
* [Homepage](https://dotty.epfl.ch)

bench/profiles/compiletime.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
charts:
22

33
- name: "Compile-time sums of constant integer types (generated)"
4-
url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala
4+
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
55
lines:
66
- key: compiletime-sum-constants
77
label: bootstrapped
88

99
- name: "Compile-time sums of term reference types (generated)"
10-
url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala
10+
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
1111
lines:
1212
- key: compiletime-sum-termrefs
1313
label: bootstrapped
1414

1515
- name: "Sums of term references, result type inferred (generated)"
16-
url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala
16+
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
1717
lines:
1818
- key: compiletime-sum-termrefs-terms
1919
label: bootstrapped
2020

2121
- name: "Compile-time sums of type applications (generated)"
22-
url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala
22+
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
2323
lines:
2424
- key: compiletime-sum-applications
2525
label: bootstrapped
2626

2727
- name: "Compile-time additions inside multiplications (generated)"
28-
url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala
28+
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
2929
lines:
3030
- key: compiletime-distribute
3131
label: bootstrapped

bench/profiles/empty.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
charts:
22

33
- name: "empty class"
4-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/empty-class.scala
4+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-class.scala
55
lines:
66
- key: empty-class
77
label: bootstrapped
88

99
- name: "empty object"
10-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/empty-object.scala
10+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-object.scala
1111
lines:
1212
- key: empty-object
1313
label: bootstrapped
1414

1515
- name: "empty file"
16-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/empty-file.scala
16+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-file.scala
1717
lines:
1818
- key: empty-file
1919
label: bootstrapped

bench/profiles/exhaustivity.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
charts:
22
- name: "exhaustivity check"
3-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/patmatexhaust.scala
3+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/patmatexhaust.scala
44
lines:
55
- key: patmatexhaust
66
label: bootstrapped
77

88
- name: "exhaustivity I"
9-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-I.scala
9+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-I.scala
1010
lines:
1111
- key: exhaustivity-I
1212
label: bootstrapped
1313

1414
- name: "exhaustivity S"
15-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-S.scala
15+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-S.scala
1616
lines:
1717
- key: exhaustivity-S
1818
label: bootstrapped
1919

2020
- name: "exhaustivity T"
21-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-T.scala
21+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-T.scala
2222
lines:
2323
- key: exhaustivity-T
2424
label: bootstrapped
2525

2626
- name: "exhaustivity V"
27-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-V.scala
27+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-V.scala
2828
lines:
2929
- key: exhaustivity-V
3030
label: bootstrapped
3131

3232
- name: "exhaustivity MIPS"
33-
url: https://github.com/lampepfl/dotty/blob/master/tests/patmat/i7186.scala
33+
url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i7186.scala
3434
lines:
3535
- key: exhaustivity-mips
3636
label: bootstrapped
3737

3838
- name: "exhaustivity i12241"
39-
url: https://github.com/lampepfl/dotty/blob/master/tests/patmat/i12241.scala
39+
url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i12241.scala
4040
lines:
4141
- key: exhaustivity-i12241
4242
label: bootstrapped
4343

4444
- name: "exhaustivity i12358"
45-
url: https://github.com/lampepfl/dotty/blob/master/tests/patmat/i12358.scala
45+
url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i12358.scala
4646
lines:
4747
- key: exhaustivity-i12358
4848
label: bootstrapped
4949

5050
- name: "exhaustivity i13565"
51-
url: https://github.com/lampepfl/dotty/blob/master/tests/pos/i13565.scala
51+
url: https://github.com/lampepfl/dotty/blob/main/tests/pos/i13565.scala
5252
lines:
5353
- key: exhaustivity-i13565
5454
label: bootstrapped

bench/profiles/implicits.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
charts:
22
- name: "implicit cache I"
3-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/implicit_cache.scala
3+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicit_cache.scala
44
lines:
55
- key: implicit-cache
66
label: bootstrapped
77
- key: implicit-cache-from-tasty
88
label: from tasty
99

1010
- name: "implicit cache II"
11-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/implicitNums.scala
11+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicitNums.scala
1212
lines:
1313
- key: implicitNums
1414
label: bootstrapped
1515
- key: implicitNums-from-tasty
1616
label: from tasty
1717

1818
- name: "implicit scope loop"
19-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/implicit-scope-loop.scala
19+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicit-scope-loop.scala
2020
lines:
2121
- key: implicit-scope-loop
2222
label: bootstrapped
2323

2424
- name: "inductive implicits"
25-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/inductive-implicits.scala
25+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/inductive-implicits.scala
2626
lines:
2727
- key: inductive-implicits
2828
label: bootstrapped

bench/profiles/misc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
charts:
22

33
- name: "issue #1535"
4-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/i1535.scala
4+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/i1535.scala
55
lines:
66
- key: i1535
77
label: bootstrapped
88

99
- name: "issue #1687"
10-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/i1687.scala
10+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/i1687.scala
1111
lines:
1212
- key: i1687
1313
label: bootstrapped

bench/profiles/projects.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ charts:
1818
label: bootstrapped
1919

2020
- name: re2
21-
url: https://github.com/lampepfl/bench/blob/master/tests/re2s
21+
url: https://github.com/lampepfl/bench/blob/main/tests/re2s
2222
lines:
2323
- key: re2s
2424
label: bootstrapped

bench/profiles/quotes.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
charts:
22
- name: "Inline a quote"
3-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/power-macro/PowerInlined-1.scala
3+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/power-macro/PowerInlined-1.scala
44
lines:
55
- key: power-macro-power-inlined-1
66
label: bootstrapped
77

88
- name: "Inline 1k quotes"
9-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/power-macro/PowerInlined-1k.scala
9+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/power-macro/PowerInlined-1k.scala
1010
lines:
1111
- key: power-macro-power-inlined-1k
1212
label: bootstrapped
1313

1414
- name: "Quote String interpolation matching"
15-
url: https://github.com/lampepfl/dotty/blob/master/tests/bench/string-interpolation-macro/Test.scala
15+
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/string-interpolation-macro/Test.scala
1616
lines:
1717
- key: quote-string-interpolation-matching
1818
label: bootstrapped

0 commit comments

Comments
 (0)