diff --git a/.codecov.yml b/.codecov.yml index e49cde1865c..fa2ff636039 100644 --- 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 index 729a2953b17..a7eede8bdd8 100644 --- 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 index 4209324dd64..4460d3299cd 100644 --- 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 index f1dfec1fdfb..6fe2a244fb3 100644 --- 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 index 9458a9bd355..9fa96b82605 100644 --- 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 index 7ecc8731c71..5e8d8527a6d 100644 --- 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 index f95bd819b63..46633947004 100644 --- 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 index 0e31f0d4726..de6bbc4793a 100644 --- 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 index a062b2b963d..bb5fc0cefe3 100644 --- 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 index 6bf5c069bad..54eafa4b107 100644 --- 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 index 85d907c5311..1e70eb1e6b2 100644 --- 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 index 90e8a425a28..45d1ba492f6 100644 --- 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 index b9c3d210c20..780ebf2426b 100644 --- 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 index 1e82cda8dd0..58c0e395d19 100644 --- 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 index da32e66f4db..9989065cb90 100644 --- 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 index 87615939fa2..1f046b0d9e3 100644 --- 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), diff --git a/README.md b/README.md index 8a89625e2b0..2577ced6151 100644 --- a/README.md +++ b/README.md @@ -206,11 +206,11 @@ If you would like to add your organization to the list, please comment on our [doc]: https://jaegertracing.io/docs/ [godoc-img]: https://godoc.org/github.com/jaegertracing/jaeger?status.svg [godoc]: https://godoc.org/github.com/jaegertracing/jaeger -[ci-img]: https://github.com/jaegertracing/jaeger/workflows/Unit%20Tests/badge.svg?branch=master -[ci]: https://github.com/jaegertracing/jaeger/actions?query=branch%3Amaster -[cov-img]: https://codecov.io/gh/jaegertracing/jaeger/branch/master/graph/badge.svg -[cov]: https://codecov.io/gh/jaegertracing/jaeger/branch/master/ -[fossa-img]: https://github.com/jaegertracing/jaeger/workflows/FOSSA/badge.svg?branch=master +[ci-img]: https://github.com/jaegertracing/jaeger/workflows/Unit%20Tests/badge.svg?branch=main +[ci]: https://github.com/jaegertracing/jaeger/actions?query=branch%3Amain +[cov-img]: https://codecov.io/gh/jaegertracing/jaeger/branch/main/graph/badge.svg +[cov]: https://codecov.io/gh/jaegertracing/jaeger/branch/main/ +[fossa-img]: https://github.com/jaegertracing/jaeger/workflows/FOSSA/badge.svg?branch=main [dapper]: https://research.google.com/pubs/pub36356.html [ubeross]: https://uber.github.io [ot-badge]: https://img.shields.io/badge/OpenTracing--1.x-inside-blue.svg diff --git a/RELEASE.md b/RELEASE.md index 72296ad706e..992263458ae 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,6 +1,6 @@ # Jaeger Backend Release Process -1. Create a PR "Prepare release X.Y.Z" against master or maintenance branch ([example](https://github.com/jaegertracing/jaeger/pull/543/files)) by updating CHANGELOG.md to include: +1. Create a PR "Prepare release X.Y.Z" against main or maintenance branch ([example](https://github.com/jaegertracing/jaeger/pull/543/files)) by updating CHANGELOG.md to include: * A new section with the header ` (YYYY-MM-DD)` * A curated list of notable changes and links to PRs. Do not simply dump git log, select the changes that affect the users. To obtain the list of all changes run `make changelog` or use `scripts/release-notes.py`. * The section can be split into sub-section if necessary, e.g. UI Changes, Backend Changes, Bug Fixes, etc. @@ -21,7 +21,7 @@ 4. The release tag will trigger a build of the docker images. Since forks don't have jaegertracingbot dockerhub token, they can never publish images to jaegertracing organisation. 1. Check the images are available on [Docker Hub](https://hub.docker.com/r/jaegertracing/). 2. For monitoring and troubleshooting, refer to the [jaegertracing/jaeger GithubActions tab](https://github.com/jaegertracing/jaeger/actions). -5. [Publish documentation](https://github.com/jaegertracing/documentation/blob/master/RELEASE.md) for the new version in [jaegertracing.io](https://www.jaegertracing.io/docs/latest). +5. [Publish documentation](https://github.com/jaegertracing/documentation/blob/main/RELEASE.md) for the new version in [jaegertracing.io](https://www.jaegertracing.io/docs/latest). 1. Check [jaegertracing.io](https://www.jaegertracing.io/docs/latest) redirects to the new documentation release version URL. 2. For monitoring and troubleshooting, refer to the [jaegertracing/documentation GithubActions tab](https://github.com/jaegertracing/documentation/actions). 6. Announce the release on the [mailing list](https://groups.google.com/g/jaeger-tracing), [slack](https://cloud-native.slack.com/archives/CGG7NFUJ3), and [twitter](https://twitter.com/JaegerTracing?lang=en). diff --git a/SECURITY.md b/SECURITY.md index a41955e5b38..50035979897 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,7 +2,7 @@ ## Supported Versions -The Jaeger project provides community support only for last minor version: bug fixes are released either as part of the next minor version or as an on-demand patch version. Independent of which version is next, all patch versions are cumulative, meaning that they represent the state of our `master` branch at the moment of the release. For instance, if the latest version is 1.19.0, bug fixes are released either as part of 1.20.0 or 1.19.1. +The Jaeger project provides community support only for last minor version: bug fixes are released either as part of the next minor version or as an on-demand patch version. Independent of which version is next, all patch versions are cumulative, meaning that they represent the state of our `main` branch at the moment of the release. For instance, if the latest version is 1.19.0, bug fixes are released either as part of 1.20.0 or 1.19.1. Security fixes are given priority and might be enough to cause a new version to be released. diff --git a/cmd/query/app/ui/placeholder/index.html b/cmd/query/app/ui/placeholder/index.html index 5f274c9f958..7e840357160 100644 --- a/cmd/query/app/ui/placeholder/index.html +++ b/cmd/query/app/ui/placeholder/index.html @@ -9,6 +9,6 @@ This is a placeholder for Jaeger UI home page. If you are seeing this, you are running a binary that was not compiled with the UI assets. - See these instructions. + See these instructions. diff --git a/docker-compose/monitor/README.md b/docker-compose/monitor/README.md index 2d5e749b836..eec560a1b82 100644 --- a/docker-compose/monitor/README.md +++ b/docker-compose/monitor/README.md @@ -117,7 +117,7 @@ e.g. a min step of 1 means the backend can only return data points that are at l ## Responses -The response data model is based on [`MetricsFamily`](https://github.com/jaegertracing/jaeger/blob/master/model/proto/metrics/openmetrics.proto#L53). +The response data model is based on [`MetricsFamily`](https://github.com/jaegertracing/jaeger/blob/main/model/proto/metrics/openmetrics.proto#L53). For example: ``` diff --git a/examples/hotrod/README.md b/examples/hotrod/README.md index b6a935be8e6..f369f87b704 100644 --- a/examples/hotrod/README.md +++ b/examples/hotrod/README.md @@ -21,7 +21,7 @@ to view the traces. A tutorial / walkthrough is available: ### Run everything via `docker-compose` -* Download `docker-compose.yml` from https://github.com/jaegertracing/jaeger/blob/master/examples/hotrod/docker-compose.yml +* Download `docker-compose.yml` from https://github.com/jaegertracing/jaeger/blob/main/examples/hotrod/docker-compose.yml * Run Jaeger backend and HotROD demo with `docker-compose -f path-to-yml-file up` * Access Jaeger UI at http://localhost:16686 and HotROD app at http://localhost:8080 * Shutdown / cleanup with `docker-compose -f path-to-yml-file down` diff --git a/monitoring/jaeger-mixin/README.md b/monitoring/jaeger-mixin/README.md index c8b00137b26..6069762e389 100644 --- a/monitoring/jaeger-mixin/README.md +++ b/monitoring/jaeger-mixin/README.md @@ -13,7 +13,7 @@ Your monitoring mixin can then be initialized as follows: ```console jb init jb install \ - github.com/jaegertracing/jaeger/monitoring/jaeger-mixin@master \ + github.com/jaegertracing/jaeger/monitoring/jaeger-mixin@main \ github.com/grafana/jsonnet-libs/grafana-builder@master \ github.com/coreos/kube-prometheus/jsonnet/kube-prometheus@main ``` diff --git a/scripts/build-crossdock.sh b/scripts/build-crossdock.sh index ae627172586..e8e0f14cb16 100755 --- a/scripts/build-crossdock.sh +++ b/scripts/build-crossdock.sh @@ -7,8 +7,8 @@ COMMIT=${GITHUB_SHA::8} make build-and-run-crossdock -# Only push images to dockerhub/quay.io for master branch -if [[ "$BRANCH" == "master" ]]; then +# Only push images to dockerhub/quay.io for the main branch +if [[ $BRANCH == "master" || "$BRANCH" == "main" ]]; then echo 'upload images to dockerhub/quay.io' REPO=jaegertracing/test-driver IMAGE_TAGS=$(bash scripts/compute-tags.sh $REPO) diff --git a/scripts/build-upload-a-docker-image.sh b/scripts/build-upload-a-docker-image.sh index 56df0ab644b..8a6afd50a36 100644 --- a/scripts/build-upload-a-docker-image.sh +++ b/scripts/build-upload-a-docker-image.sh @@ -48,14 +48,14 @@ if [[ "${local_test_only}" = "Y" ]]; then IMAGE_TAGS="--tag localhost:5000/${name_space}/${component_name}:latest" PUSHTAG="type=image, push=true" else - # Only push multi-arch images to dockerhub/quay.io for master branch or for release tags vM.N.P - if [[ "$BRANCH" == "master" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + # Only push multi-arch images to dockerhub/quay.io for main branch or for release tags vM.N.P + if [[ "$BRANCH" == "master" || "$BRANCH" == "main" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then echo "build docker images and upload to dockerhub/quay.io, BRANCH=$BRANCH" bash scripts/docker-login.sh PUSHTAG="type=image, push=true" upload_flag=" and uploading" else - echo 'skip docker images upload, only allowed for tagged releases or master (latest tag)' + echo 'skip docker images upload, only allowed for tagged releases or main (latest tag)' PUSHTAG="type=image, push=false" fi fi diff --git a/scripts/compute-tags.sh b/scripts/compute-tags.sh index 342e3c70b3f..8198f493b9b 100644 --- a/scripts/compute-tags.sh +++ b/scripts/compute-tags.sh @@ -8,7 +8,7 @@ BASE_BUILD_IMAGE=$1 BRANCH=${BRANCH:?'expecting BRANCH env var'} ## if we are on a release tag, let's extract the version number -## the other possible value, currently, is 'master' (or another branch name) +## the other possible value, currently, is 'main' (or another branch name) if [[ $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then MAJOR_MINOR_PATCH=$(echo ${BRANCH} | grep -Po "([\d\.]+)") MAJOR_MINOR=$(echo ${MAJOR_MINOR_PATCH} | awk -F. '{print $1"."$2}') diff --git a/scripts/hotrod-integration-test.sh b/scripts/hotrod-integration-test.sh index 632a7d035e2..7e4c1bda6f8 100755 --- a/scripts/hotrod-integration-test.sh +++ b/scripts/hotrod-integration-test.sh @@ -27,6 +27,4 @@ fi docker rm -f $CID BRANCH=${BRANCH:?'missing BRANCH env var'} - -# Only push images to dockerhub/quay.io for master branch or for release tags vM.N.P bash scripts/build-upload-a-docker-image.sh -c example-hotrod -d examples/hotrod -p "${platforms}" diff --git a/scripts/release-notes.py b/scripts/release-notes.py index bafa55c6969..928a9a5d9cd 100644 --- a/scripts/release-notes.py +++ b/scripts/release-notes.py @@ -26,7 +26,7 @@ def eprint(*args, **kwargs): def num_commits_since_prev_tag(token, base_url): tags_url = f"{base_url}/tags" - trunk = "master" + trunk = "main" req = Request(tags_url) req.add_header("Authorization", f"token {token}")