Skip to content

Commit 7872d1b

Browse files
jpkrohlingjpkrohling
authored
Prepare to rename master to main (#3420)
* Prepare to rename master to main Signed-off-by: Juraci Paixão Kröhling <[email protected]> * Revert change to opentelemetry/spec repo Signed-off-by: Juraci Paixão Kröhling <[email protected]> * Use main branch for jaeger-ui Signed-off-by: Juraci Paixão Kröhling <[email protected]>
1 parent 398f096 commit 7872d1b

28 files changed

+130
-66
lines changed

Diff for: ‎.codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
codecov:
22
notify:
33
require_ci_to_pass: yes
4-
strict_yaml_branch: master # only use the latest copy on master branch
4+
strict_yaml_branch: main # only use the latest copy on the main branch
55

66
coverage:
77
precision: 2

Diff for: ‎.github/workflows/ci-all-in-one-build.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: Build all-in-one
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813

914
jobs:
1015
all-in-one:

Diff for: ‎.github/workflows/ci-build-binaries.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: Build binaries
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813

914
jobs:
1015
build-binaries:

Diff for: ‎.github/workflows/ci-cassandra.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: CIT Cassandra
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813

914
jobs:
1015
cassandra:

Diff for: ‎.github/workflows/ci-crossdock.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: CIT Crossdock
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813

914
jobs:
1015
crossdock:

Diff for: ‎.github/workflows/ci-docker-build.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: Build docker images
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813

914
jobs:
1015
docker-images:

Diff for: ‎.github/workflows/ci-elasticsearch.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: CIT Elasticsearch
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813

914
jobs:
1015
elasticsearch:

Diff for: ‎.github/workflows/ci-grpc-badger.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: CIT gRPC And Badger
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813

914
jobs:
1015
grpc-and-badger:

Diff for: ‎.github/workflows/ci-hotrod.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: CIT Hotrod
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813

914
jobs:
1015
hotrod:

Diff for: ‎.github/workflows/ci-kafka.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: CIT Kafka
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813

914
jobs:
1015
kafka:

Diff for: ‎.github/workflows/ci-protogen-tests.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: Protogen Validation
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813

914
jobs:
1015
protogen:

Diff for: ‎.github/workflows/ci-unit-tests.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: Unit Tests
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813

914
jobs:
1015
unit-tests:

Diff for: ‎.github/workflows/codeql.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
7+
- main
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- master
12+
- main
813
schedule:
914
- cron: '31 6 * * 1'
1015

Diff for: ‎.github/workflows/fossa.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
name: FOSSA
2+
23
on:
34
push:
4-
branches: [master]
5+
branches:
6+
- master
7+
- main
8+
59
pull_request:
6-
branches: [master]
10+
branches:
11+
- master
12+
- main
713

814
jobs:
915
fossa-license-scan:

Diff for: ‎CHANGELOG.md

+17-17
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ next release
2727

2828
### UI Changes
2929

30-
* UI pinned to version 1.19.0. The changelog is available here [v1.19.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v1190-dec-1-2021)
30+
* UI pinned to version 1.19.0. The changelog is available here [v1.19.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v1190-dec-1-2021)
3131

3232
1.28.0 (2021-11-06)
3333
-------------------
@@ -54,7 +54,7 @@ next release
5454

5555
### UI Changes
5656

57-
* UI pinned to version 1.18.0. The changelog is available here [v1.18.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v1180-nov-6-2021)
57+
* UI pinned to version 1.18.0. The changelog is available here [v1.18.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v1180-nov-6-2021)
5858

5959

6060
1.27.0 (2021-10-06)
@@ -79,7 +79,7 @@ next release
7979

8080
### UI Changes
8181

82-
* UI pinned to version 1.17.0. The changelog is available here [v1.17.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v1170-oct-6-2021)
82+
* UI pinned to version 1.17.0. The changelog is available here [v1.17.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v1170-oct-6-2021)
8383

8484

8585
1.26.0 (2021-09-06)
@@ -255,7 +255,7 @@ next release
255255

256256
### UI Changes
257257

258-
* UI pinned to version 1.13.0. The changelog is available here [v1.13.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v1130-february-20-2021)
258+
* UI pinned to version 1.13.0. The changelog is available here [v1.13.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v1130-february-20-2021)
259259

260260

261261
1.21.0 (2020-11-13)
@@ -296,7 +296,7 @@ next release
296296

297297
### UI Changes
298298

299-
* UI pinned to version 1.12.0. The changelog is available here [v1.12.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v1120-november-14-2020)
299+
* UI pinned to version 1.12.0. The changelog is available here [v1.12.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v1120-november-14-2020)
300300

301301

302302
1.20.0 (2020-09-29)
@@ -363,7 +363,7 @@ next release
363363

364364
### UI Changes
365365

366-
* UI pinned to version 1.11.0. The changelog is available here [v1.11.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v1110-september-28-2020)
366+
* UI pinned to version 1.11.0. The changelog is available here [v1.11.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v1110-september-28-2020)
367367

368368
1.19.2 (2020-08-26)
369369
-------------------
@@ -418,7 +418,7 @@ The pull request [#2297](https://github.com/jaegertracing/jaeger/pull/2297) aime
418418

419419
### UI Changes
420420

421-
* UI pinned to version 1.10.0. The changelog is available here [v1.10.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v1100-august-25-2020)
421+
* UI pinned to version 1.10.0. The changelog is available here [v1.10.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v1100-august-25-2020)
422422

423423
1.18.1 (2020-06-19)
424424
------------------
@@ -521,7 +521,7 @@ The pull request [#2297](https://github.com/jaegertracing/jaeger/pull/2297) aime
521521

522522
### UI Changes
523523

524-
* UI pinned to version 1.9.0. The changelog is available here [v1.9.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v190-may-14-2020)
524+
* UI pinned to version 1.9.0. The changelog is available here [v1.9.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v190-may-14-2020)
525525

526526
1.17.1 (2020-03-13)
527527
------------------
@@ -537,7 +537,7 @@ The pull request [#2297](https://github.com/jaegertracing/jaeger/pull/2297) aime
537537

538538
### UI Changes
539539

540-
* UI pinned to version 1.8.0. The changelog is available here [v1.8.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v180-march-12-2020)
540+
* UI pinned to version 1.8.0. The changelog is available here [v1.8.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v180-march-12-2020)
541541

542542
1.17.0 (2020-02-24)
543543
------------------
@@ -579,7 +579,7 @@ The pull request [#2297](https://github.com/jaegertracing/jaeger/pull/2297) aime
579579

580580
### UI Changes
581581

582-
* UI pinned to version 1.7.0. The changelog is available here [v1.7.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v170-february-21-2020)
582+
* UI pinned to version 1.7.0. The changelog is available here [v1.7.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v170-february-21-2020)
583583

584584
1.16.0 (2019-12-17)
585585
------------------
@@ -691,7 +691,7 @@ running curator would immediately remove the old index.
691691

692692
### UI Changes
693693

694-
* UI pinned to version 1.6.0. The changelog is available here [v1.6.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v160-december-16-2019)
694+
* UI pinned to version 1.6.0. The changelog is available here [v1.6.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v160-december-16-2019)
695695

696696
1.15.1 (2019-11-07)
697697
------------------
@@ -738,7 +738,7 @@ running curator would immediately remove the old index.
738738

739739
#### UI Changes
740740

741-
* UI pinned to version 1.5.0. The changelog is available here [v1.5.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v150-november-4-2019)
741+
* UI pinned to version 1.5.0. The changelog is available here [v1.5.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v150-november-4-2019)
742742

743743
1.14.0 (2019-09-02)
744744
------------------
@@ -797,7 +797,7 @@ running curator would immediately remove the old index.
797797

798798
#### UI Changes
799799

800-
* UI pinned to version 1.4.0. The changelog is available here [v1.4.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v130-june-21-2019)
800+
* UI pinned to version 1.4.0. The changelog is available here [v1.4.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v130-june-21-2019)
801801

802802
1.13.1 (2019-06-28)
803803
------------------
@@ -858,7 +858,7 @@ running curator would immediately remove the old index.
858858

859859
#### UI Changes
860860

861-
* UI pinned to version 1.3.0. The changelog is available here [v1.3.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v130-june-21-2019)
861+
* UI pinned to version 1.3.0. The changelog is available here [v1.3.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v130-june-21-2019)
862862

863863
1.12.0 (2019-05-16)
864864
------------------
@@ -927,7 +927,7 @@ running curator would immediately remove the old index.
927927

928928
#### UI Changes
929929

930-
* UI pinned to version 1.2.0. The changelog is available here [v1.2.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v120-may-14-2019)
930+
* UI pinned to version 1.2.0. The changelog is available here [v1.2.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v120-may-14-2019)
931931

932932
1.11.0 (2019-03-07)
933933
------------------
@@ -972,7 +972,7 @@ running curator would immediately remove the old index.
972972

973973
#### UI Changes
974974

975-
* UI pinned to version 1.1.0. The changelog is available here [v1.1.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v110-march-3-2019)
975+
* UI pinned to version 1.1.0. The changelog is available here [v1.1.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v110-march-3-2019)
976976

977977

978978
1.10.1 (2019-02-21)
@@ -1135,7 +1135,7 @@ jaeger_http_server_errors{source="collector-proxy",status="5xx"}
11351135

11361136
#### UI Changes
11371137

1138-
* UI pinned to version 1.0.0. The changelog is available here [v1.0.0](https://github.com/jaegertracing/jaeger-ui/blob/master/CHANGELOG.md#v100-january-18-2019)
1138+
* UI pinned to version 1.0.0. The changelog is available here [v1.0.0](https://github.com/jaegertracing/jaeger-ui/blob/main/CHANGELOG.md#v100-january-18-2019)
11391139

11401140
1.8.2 (2018-11-28)
11411141
------------------

Diff for: ‎GOVERNANCE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ To become a maintainer you need to demonstrate the following:
1818
* commitment to the project
1919
* participate in discussions, contributions, code reviews for 3 months or more,
2020
* perform code reviews for 10 non-trivial pull requests,
21-
* contribute 10 non-trivial pull requests and have them merged into master,
21+
* contribute 10 non-trivial pull requests and have them merged into the `main` branch,
2222
* ability to write good code,
2323
* ability to collaborate with the team,
2424
* understanding of how the team works (policies, processes for testing and code review, etc),

0 commit comments

Comments
 (0)