Prepare to rename master to main (#3420)

* Prepare to rename master to main Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de> * Revert change to opentelemetry/spec repo Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de> * Use main branch for jaeger-ui Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
jaegertracing · Dec 1, 2021 · 7872d1b · 7872d1b
1 parent 398f096
commit 7872d1b
Show file tree

Hide file tree

Showing 28 changed files with 130 additions and 66 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -1,7 +1,7 @@
 codecov:
   notify:
     require_ci_to_pass: yes
-  strict_yaml_branch: master  # only use the latest copy on master branch
+  strict_yaml_branch: main  # only use the latest copy on the main branch
 
 coverage:
   precision: 2

diff --git a/.github/workflows/ci-all-in-one-build.yml b/.github/workflows/ci-all-in-one-build.yml
@@ -2,9 +2,14 @@ name: Build all-in-one
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   all-in-one:

diff --git a/.github/workflows/ci-build-binaries.yml b/.github/workflows/ci-build-binaries.yml
@@ -2,9 +2,14 @@ name: Build binaries
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   build-binaries:

diff --git a/.github/workflows/ci-cassandra.yml b/.github/workflows/ci-cassandra.yml
@@ -2,9 +2,14 @@ name: CIT Cassandra
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   cassandra:

diff --git a/.github/workflows/ci-crossdock.yml b/.github/workflows/ci-crossdock.yml
@@ -2,9 +2,14 @@ name: CIT Crossdock
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   crossdock:

diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml
@@ -2,9 +2,14 @@ name: Build docker images
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   docker-images:

diff --git a/.github/workflows/ci-elasticsearch.yml b/.github/workflows/ci-elasticsearch.yml
@@ -2,9 +2,14 @@ name: CIT Elasticsearch
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   elasticsearch:

diff --git a/.github/workflows/ci-grpc-badger.yml b/.github/workflows/ci-grpc-badger.yml
@@ -2,9 +2,14 @@ name: CIT gRPC And Badger
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   grpc-and-badger:

diff --git a/.github/workflows/ci-hotrod.yml b/.github/workflows/ci-hotrod.yml
@@ -2,9 +2,14 @@ name: CIT Hotrod
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   hotrod:

diff --git a/.github/workflows/ci-kafka.yml b/.github/workflows/ci-kafka.yml
@@ -2,9 +2,14 @@ name: CIT Kafka
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   kafka:

diff --git a/.github/workflows/ci-protogen-tests.yml b/.github/workflows/ci-protogen-tests.yml
@@ -2,9 +2,14 @@ name: Protogen Validation
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   protogen:

diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml
@@ -2,9 +2,14 @@ name: Unit Tests
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   unit-tests:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,9 +2,14 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
   schedule:
     - cron: '31 6 * * 1'
 

diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -1,9 +1,15 @@
 name: FOSSA
+
 on:
   push:
-    branches: [master]
+    branches:
+      - master
+      - main
+
   pull_request:
-    branches: [master]
+    branches:
+      - master
+      - main
 
 jobs:
   fossa-license-scan:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,7 +27,7 @@ next release
 
 ### UI Changes
 
-* 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)
+* 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)
 
 1.28.0 (2021-11-06)
 -------------------
@@ -54,7 +54,7 @@ next release
 
 ### UI Changes
 
-* 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)
+* 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)
 
 
 1.27.0 (2021-10-06)
@@ -79,7 +79,7 @@ next release
 
 ### UI Changes
 
-* 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)
+* 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)
 
 
 1.26.0 (2021-09-06)
@@ -255,7 +255,7 @@ next release
 
 ### UI Changes
 
-* 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)
+* 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)
 
 
 1.21.0 (2020-11-13)
@@ -296,7 +296,7 @@ next release
 
 ### UI Changes
 
-* 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)
+* 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)
 
 
 1.20.0 (2020-09-29)
@@ -363,7 +363,7 @@ next release
 
 ### UI Changes
 
-* 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)
+* 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)
 
 1.19.2 (2020-08-26)
 -------------------
@@ -418,7 +418,7 @@ The pull request [#2297](https://github.com/jaegertracing/jaeger/pull/2297) aime
 
 ### UI Changes
 
-* 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)
+* 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)
 
 1.18.1 (2020-06-19)
 ------------------
@@ -521,7 +521,7 @@ The pull request [#2297](https://github.com/jaegertracing/jaeger/pull/2297) aime
 
 ### UI Changes
 
-* 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)
+* 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)
 
 1.17.1 (2020-03-13)
 ------------------
@@ -537,7 +537,7 @@ The pull request [#2297](https://github.com/jaegertracing/jaeger/pull/2297) aime
 
 ### UI Changes
 
-* 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)
+* 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)
 
 1.17.0 (2020-02-24)
 ------------------
@@ -579,7 +579,7 @@ The pull request [#2297](https://github.com/jaegertracing/jaeger/pull/2297) aime
 
 ### UI Changes
 
-* 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)
+* 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)
 
 1.16.0 (2019-12-17)
 ------------------
@@ -691,7 +691,7 @@ running curator would immediately remove the old index.
 
 ### UI Changes
 
-* 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)
+* 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)
 
 1.15.1 (2019-11-07)
 ------------------
@@ -738,7 +738,7 @@ running curator would immediately remove the old index.
 
 #### UI Changes
 
-* 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)
+* 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)
 
 1.14.0 (2019-09-02)
 ------------------
@@ -797,7 +797,7 @@ running curator would immediately remove the old index.
 
 #### UI Changes
 
-* 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)
+* 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)
 
 1.13.1 (2019-06-28)
 ------------------
@@ -858,7 +858,7 @@ running curator would immediately remove the old index.
 
 #### UI Changes
 
-* 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)
+* 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)
 
 1.12.0 (2019-05-16)
 ------------------
@@ -927,7 +927,7 @@ running curator would immediately remove the old index.
 
 #### UI Changes
 
-* 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)
+* 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)
 
 1.11.0 (2019-03-07)
 ------------------
@@ -972,7 +972,7 @@ running curator would immediately remove the old index.
 
 #### UI Changes
 
-* 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)
+* 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)
 
 
 1.10.1 (2019-02-21)
@@ -1135,7 +1135,7 @@ jaeger_http_server_errors{source="collector-proxy",status="5xx"}
 
 #### UI Changes
 
-* 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)
+* 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)
 
 1.8.2 (2018-11-28)
 ------------------

diff --git a/GOVERNANCE.md b/GOVERNANCE.md
@@ -18,7 +18,7 @@ To become a maintainer you need to demonstrate the following:
   * commitment to the project
     * participate in discussions, contributions, code reviews for 3 months or more,
     * perform code reviews for 10 non-trivial pull requests,
-    * contribute 10 non-trivial pull requests and have them merged into master,
+    * contribute 10 non-trivial pull requests and have them merged into the `main` branch,
   * ability to write good code,
   * ability to collaborate with the team,
   * understanding of how the team works (policies, processes for testing and code review, etc),