diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 561d63741977..3d03a4aa6ab1 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -203,14 +203,14 @@ options it accepts should also call [`google::cloud::internal::CheckExpectedOptions<...>(...)`][check-expected-example-link] in order to help users diagnose option-related issues in their code. -[spanner-connection-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/master/google/cloud/spanner/connection_options.h -[query-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/master/google/cloud/spanner/query_options.h -[client-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/master/google/cloud/storage/client_options.h -[common-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/master/google/cloud/common_options.h -[grpc-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/master/google/cloud/grpc_options.h -[spanner-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/master/google/cloud/spanner/options.h -[options-link]: https://github.com/googleapis/google-cloud-cpp/blob/master/google/cloud/options.h -[spanner-defaults-link]: https://github.com/googleapis/google-cloud-cpp/blob/master/google/cloud/spanner/internal/defaults.h +[spanner-connection-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/main/google/cloud/spanner/connection_options.h +[query-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/main/google/cloud/spanner/query_options.h +[client-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/main/google/cloud/storage/client_options.h +[common-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/main/google/cloud/common_options.h +[grpc-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/main/google/cloud/grpc_options.h +[spanner-options-link]: https://github.com/googleapis/google-cloud-cpp/blob/main/google/cloud/spanner/options.h +[options-link]: https://github.com/googleapis/google-cloud-cpp/blob/main/google/cloud/options.h +[spanner-defaults-link]: https://github.com/googleapis/google-cloud-cpp/blob/main/google/cloud/spanner/internal/defaults.h [check-expected-example-link]: https://github.com/googleapis/google-cloud-cpp/blob/6bd0fae69af98939a1ba4fedea7bb20366ad15d9/google/cloud/spanner/client.cc#L358-L360 ## Deviations from the "normal" Architecture diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e8a4a88ef02..01324b71fe22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,10 +136,10 @@ option(GOOGLE_CLOUD_CPP_GEN_DOCS_FOR_GOOGLEAPIS_DEV "Use relative URLs in docs for googleapis.dev" OFF) mark_as_advanced(GOOGLE_CLOUD_CPP_GEN_DOCS_FOR_GOOGLEAPIS_DEV) -# Use master as the version part of the relative URLs. -option(GOOGLE_CLOUD_CPP_USE_MASTER_FOR_REFDOC_LINKS - "Use master as the version part for refdoc relative links" OFF) -mark_as_advanced(GOOGLE_CLOUD_CPP_USE_MASTER_FOR_REFDOC_LINKS) +# Use main as the version part of the relative URLs. +option(GOOGLE_CLOUD_CPP_USE_MAIN_FOR_REFDOC_LINKS + "Use main as the version part for refdoc relative links" OFF) +mark_as_advanced(GOOGLE_CLOUD_CPP_USE_MAIN_FOR_REFDOC_LINKS) set(PROJECT_THIRD_PARTY_DIR "${PROJECT_SOURCE_DIR}/third_party") diff --git a/README.md b/README.md index 6827566c84c6..8063dde45fd6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ [kokoro-macos-cmake-link]: https://storage.googleapis.com/cloud-cpp-kokoro-status/macos/kokoro-cmake-super-link.html [kokoro-macos-bazel-shield]: https://storage.googleapis.com/cloud-cpp-kokoro-status/macos/kokoro-bazel.svg [kokoro-macos-bazel-link]: https://storage.googleapis.com/cloud-cpp-kokoro-status/macos/kokoro-bazel-link.html -[codecov-shield]: https://codecov.io/gh/googleapis/google-cloud-cpp/branch/master/graph/badge.svg +[codecov-shield]: https://codecov.io/gh/googleapis/google-cloud-cpp/branch/main/graph/badge.svg [codecov-link]: https://codecov.io/gh/googleapis/google-cloud-cpp [gcb-clang-tidy-shield]: https://storage.googleapis.com/cloud-cpp-community-publiclogs/badges/google-cloud-cpp/main/clang-tidy.svg [gcb-clang-tidy-link]: https://storage.googleapis.com/cloud-cpp-community-publiclogs/badges/google-cloud-cpp/main/clang-tidy.html @@ -156,7 +156,7 @@ int main(int argc, char* argv[]) { * This project supports Windows, macOS, Linux * This project supports C++11 (and higher) compilers (we test with GCC \>= 5.4, Clang >= 3.8, and MSVC \>= 2019) * This project supports Bazel and CMake builds. See the [Quickstart examples](https://github.com/googleapis/google-cloud-cpp#quickstart) -* This project uses dependencies described in [doc/packaging.md](https://github.com/googleapis/google-cloud-cpp/blob/master/doc/packaging.md) +* This project uses dependencies described in [doc/packaging.md](https://github.com/googleapis/google-cloud-cpp/blob/main/doc/packaging.md) * This project works with or without exceptions enabled * This project cuts [monthly releases](https://github.com/googleapis/google-cloud-cpp/releases) with detailed release notes diff --git a/ci/cloudbuild/builds/cmake-super.sh b/ci/cloudbuild/builds/cmake-super.sh index fa655fc98926..71b1d43ef588 100755 --- a/ci/cloudbuild/builds/cmake-super.sh +++ b/ci/cloudbuild/builds/cmake-super.sh @@ -29,4 +29,4 @@ cmake -GNinja \ -Hsuper -Bcmake-out cmake --build cmake-out # Testing is automatically done by the super build itself. See -# https://github.com/googleapis/google-cloud-cpp/blob/master/super/CMakeLists.txt +# https://github.com/googleapis/google-cloud-cpp/blob/main/super/CMakeLists.txt diff --git a/ci/coverity-scan.sh b/ci/coverity-scan.sh index af931f46f9d6..08e9d26fac9c 100755 --- a/ci/coverity-scan.sh +++ b/ci/coverity-scan.sh @@ -57,6 +57,6 @@ tar caf google-cloud-cpp.tar.xz cov-int curl --form "token=${COVERITY_SCAN_TOKEN}" \ --form email="${COVERITY_SCAN_EMAIL}" \ --form file=@google-cloud-cpp.tar.xz \ - --form version="master" \ + --form version="main" \ --form description="Automatically Compiled Coverity Scan" \ https://scan.coverity.com/builds?project=googleapis%2Fgoogle-cloud-cpp diff --git a/ci/generate-markdown/generate-bigtable-readme.sh b/ci/generate-markdown/generate-bigtable-readme.sh index eac3f358f679..6b9e4d61bac3 100755 --- a/ci/generate-markdown/generate-bigtable-readme.sh +++ b/ci/generate-markdown/generate-bigtable-readme.sh @@ -49,7 +49,7 @@ Please note that the Google Cloud C++ client libraries do **not** follow [doxygen-link]: https://googleapis.dev/cpp/google-cloud-bigtable/latest/ [cloud-bigtable-docs]: https://cloud.google.com/bigtable/docs/ -[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/master/google/cloud/bigtable +[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud/bigtable ## Quickstart diff --git a/ci/generate-markdown/generate-pubsub-readme.sh b/ci/generate-markdown/generate-pubsub-readme.sh index bedc0e91253e..b801d4c91995 100755 --- a/ci/generate-markdown/generate-pubsub-readme.sh +++ b/ci/generate-markdown/generate-pubsub-readme.sh @@ -49,7 +49,7 @@ Please note that the Google Cloud C++ client libraries do **not** follow [doxygen-link]: https://googleapis.dev/cpp/google-cloud-pubsub/latest/ [cloud-spanner-docs]: https://cloud.google.com/pubsub/docs/ -[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/master/google/cloud/pubsub +[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud/pubsub ## Quickstart diff --git a/ci/generate-markdown/generate-readme.sh b/ci/generate-markdown/generate-readme.sh index 495ba56546eb..028e15f4de83 100755 --- a/ci/generate-markdown/generate-readme.sh +++ b/ci/generate-markdown/generate-readme.sh @@ -43,7 +43,7 @@ cat <<"EOF" [kokoro-macos-cmake-link]: https://storage.googleapis.com/cloud-cpp-kokoro-status/macos/kokoro-cmake-super-link.html [kokoro-macos-bazel-shield]: https://storage.googleapis.com/cloud-cpp-kokoro-status/macos/kokoro-bazel.svg [kokoro-macos-bazel-link]: https://storage.googleapis.com/cloud-cpp-kokoro-status/macos/kokoro-bazel-link.html -[codecov-shield]: https://codecov.io/gh/googleapis/google-cloud-cpp/branch/master/graph/badge.svg +[codecov-shield]: https://codecov.io/gh/googleapis/google-cloud-cpp/branch/main/graph/badge.svg [codecov-link]: https://codecov.io/gh/googleapis/google-cloud-cpp [gcb-clang-tidy-shield]: https://storage.googleapis.com/cloud-cpp-community-publiclogs/badges/google-cloud-cpp/main/clang-tidy.svg [gcb-clang-tidy-link]: https://storage.googleapis.com/cloud-cpp-community-publiclogs/badges/google-cloud-cpp/main/clang-tidy.html @@ -142,7 +142,7 @@ cat <<"EOF" * This project supports Windows, macOS, Linux * This project supports C++11 (and higher) compilers (we test with GCC \>= 5.4, Clang >= 3.8, and MSVC \>= 2019) * This project supports Bazel and CMake builds. See the [Quickstart examples](https://github.com/googleapis/google-cloud-cpp#quickstart) -* This project uses dependencies described in [doc/packaging.md](https://github.com/googleapis/google-cloud-cpp/blob/master/doc/packaging.md) +* This project uses dependencies described in [doc/packaging.md](https://github.com/googleapis/google-cloud-cpp/blob/main/doc/packaging.md) * This project works with or without exceptions enabled * This project cuts [monthly releases](https://github.com/googleapis/google-cloud-cpp/releases) with detailed release notes diff --git a/ci/generate-markdown/generate-spanner-readme.sh b/ci/generate-markdown/generate-spanner-readme.sh index 98c806079cc5..d70267150009 100755 --- a/ci/generate-markdown/generate-spanner-readme.sh +++ b/ci/generate-markdown/generate-spanner-readme.sh @@ -49,7 +49,7 @@ Please note that the Google Cloud C++ client libraries do **not** follow [doxygen-link]: https://googleapis.dev/cpp/google-cloud-spanner/latest/ [cloud-spanner-docs]: https://cloud.google.com/spanner/docs/ -[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/master/google/cloud/spanner +[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud/spanner ## Quickstart diff --git a/ci/generate-markdown/generate-storage-readme.sh b/ci/generate-markdown/generate-storage-readme.sh index c78ff1b41510..442a9fc6b9bb 100755 --- a/ci/generate-markdown/generate-storage-readme.sh +++ b/ci/generate-markdown/generate-storage-readme.sh @@ -52,7 +52,7 @@ Please note that the Google Cloud C++ client libraries do **not** follow [doxygen-link]: https://googleapis.dev/cpp/google-cloud-storage/latest/ [cloud-storage-docs]: https://cloud.google.com/storage/docs/ -[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/master/google/cloud/storage +[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud/storage ## Quickstart diff --git a/ci/kokoro/README.md b/ci/kokoro/README.md index d299bbb1aab5..e61c95133645 100644 --- a/ci/kokoro/README.md +++ b/ci/kokoro/README.md @@ -62,7 +62,7 @@ little bit, we cache these images in Google Container Registry (GCR). Builds triggered by GitHub pull requests download the cached image, then use that cache to rebuild the image (which usually results in "nothing to rebuild") and then run the build using the newly created image. Builds triggered by GitHub commits -to a branch (typically `master` or a release branch) only use the cache if +to a branch (typically `main` or a release branch) only use the cache if rebuilding the image from scratch fails. Such builds also push new versions of the cached image to GCR. diff --git a/ci/kokoro/macos/build.sh b/ci/kokoro/macos/build.sh index 004d3aecc94c..82583b11377d 100755 --- a/ci/kokoro/macos/build.sh +++ b/ci/kokoro/macos/build.sh @@ -136,7 +136,7 @@ rm -f "${GRPC_DEFAULT_SSL_ROOTS_FILE_PATH}" curl -sSL --retry 10 -o "${GRPC_DEFAULT_SSL_ROOTS_FILE_PATH}" \ https://pki.google.com/roots.pem -BRANCH="${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH:-master}" +BRANCH="${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH:-main}" readonly BRANCH echo "================================================================" io::log_yellow "detected the branch name: ${BRANCH}." diff --git a/ci/kokoro/windows/build.ps1 b/ci/kokoro/windows/build.ps1 index a36901209d59..ea32da9a1cb3 100644 --- a/ci/kokoro/windows/build.ps1 +++ b/ci/kokoro/windows/build.ps1 @@ -50,7 +50,7 @@ the KOKORO_JOB_NAME environment variable. # TODO(#4896): Enable generator integration tests for windows. $env:GOOGLE_CLOUD_CPP_GENERATOR_RUN_INTEGRATION_TESTS = "no" -$env:BUILD_CACHE = "gs://cloud-cpp-kokoro-results/build-cache/google-cloud-cpp/master/vcpkg-binary-cache/windows/${BuildName}/" +$env:BUILD_CACHE = "gs://cloud-cpp-kokoro-results/build-cache/google-cloud-cpp/main/vcpkg-binary-cache/windows/${BuildName}/" $DependencyScriptArgs=@() if (($BuildName -eq "cmake") -or ($BuildName -eq "cmake-debug")) { $env:CONFIG = "Debug" diff --git a/doc/adr/2019-01-04-error-reporting-with-statusor.md b/doc/adr/2019-01-04-error-reporting-with-statusor.md index 3567f1c9ea79..89930d719904 100644 --- a/doc/adr/2019-01-04-error-reporting-with-statusor.md +++ b/doc/adr/2019-01-04-error-reporting-with-statusor.md @@ -31,7 +31,7 @@ no immediate plans to change the API for Cloud Bigtable. We will communicate a timeline to change this API in a separate document. [badbit-link]: https://en.cppreference.com/w/cpp/io/ios_base/iostate -[gcs-link]: https://github.com/googleapis/google-cloud-cpp/tree/master/google/cloud/storage -[bigtable-link]: https://github.com/googleapis/google-cloud-cpp/tree/master/google/cloud/bigtable +[gcs-link]: https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud/storage +[bigtable-link]: https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud/bigtable [survey-link]: https://isocpp.org/blog/2018/03/results-summary-cpp-foundation-developer-survey-lite-2018-02 diff --git a/doc/contributor/howto-guide-forks-and-pull-requests.md b/doc/contributor/howto-guide-forks-and-pull-requests.md index f1337095ca7d..a7accf459e41 100644 --- a/doc/contributor/howto-guide-forks-and-pull-requests.md +++ b/doc/contributor/howto-guide-forks-and-pull-requests.md @@ -37,13 +37,13 @@ To pull new commits from `upstream` into your local repo and [sync your fork][syncing-a-fork] you can do the following: ```console -git checkout master -git pull --ff-only upstream master +git checkout main +git pull --ff-only upstream main git push # Pushes new commits up to your fork on GitHub ``` > :attention: you probably want to do this periodically, and almost certainly -> before starting any new branches. Keeping your default branch (aka `master`) +> before starting any new branches. Keeping your default branch (aka `main`) > in sync is important to make your pull requests easy to review. ## Preparing to make a pull requests @@ -55,7 +55,7 @@ change for review you need to create a pull request. Typically you start by: 1. Picking an existing [GitHub bug][mastering-issues] to work on. 1. Create a new [branch][about-branches] for each feature (or bug fix). ```console - git checkout master + git checkout main git checkout -b my-feature-branch git push -u origin my-feature-branch # Tells fork on GitHub about new branch # make your changes @@ -71,15 +71,15 @@ change for review you need to create a pull request. Typically you start by: ### Resolving Conflicts and Rebasing From time to time your pull request may have conflicts with the destination -branch (likely `master`). If so, we request that you [rebase][about-rebase] +branch (likely `main`). If so, we request that you [rebase][about-rebase] your branch instead of merging. The reviews can become very confusing if you -merge during a pull request. You should first ensure that your `master` +merge during a pull request. You should first ensure that your `main` branch has all the latest commits by syncing your fork (see above), then do the following: ```shell git checkout my-feature-branch -git rebase master +git rebase main git push --force-with-lease ``` @@ -108,7 +108,7 @@ ci/cloudbuild/build.sh -t asan-pr --docker ## Merging the changes Eventually the reviewers accept your changes, and they are merged into the -`master` branch. We use "squash commits", where all your commits become a single +`main` branch. We use "squash commits", where all your commits become a single commit into the default branch. A project owner needs to merge your changes, if you are a project owner, the expectation is that you will perform the merge operation, and update the commit comments to something readable. diff --git a/doc/contributor/howto-guide-setup-development-workstation.md b/doc/contributor/howto-guide-setup-development-workstation.md index 95e5701acca1..04cd07dda605 100644 --- a/doc/contributor/howto-guide-setup-development-workstation.md +++ b/doc/contributor/howto-guide-setup-development-workstation.md @@ -38,7 +38,7 @@ install additional tools to run the unit and integration tests. These instructions will describe how to install these tools for Ubuntu 18.04 (Bionic Beaver). For other distributions you may consult the Dockerfiles in -[ci/cloudbuild/dockerfiles/](https://github.com/googleapis/google-cloud-cpp/tree/master/ci/cloudbuild/dockerfiles) +[ci/cloudbuild/dockerfiles/](https://github.com/googleapis/google-cloud-cpp/tree/main/ci/cloudbuild/dockerfiles) If you use a different distribution, you will need to use the corresponding package manager (`dnf`, `zypper`, `apk`, etc.) and find the corresponding package names. diff --git a/google/cloud/README.md b/google/cloud/README.md index 6cf9eb43dae2..57e4e412db7e 100644 --- a/google/cloud/README.md +++ b/google/cloud/README.md @@ -30,7 +30,7 @@ notice. These include `google/cloud/internal/`, and * Detailed header comments in our [public `.h`][source-link] files [doxygen-link]: https://googleapis.dev/cpp/google-cloud-common/latest/ -[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/master/google/cloud +[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud ## Contributing changes diff --git a/google/cloud/bigtable/README.md b/google/cloud/bigtable/README.md index 4e7fc1e974e7..6b87867e10f9 100644 --- a/google/cloud/bigtable/README.md +++ b/google/cloud/bigtable/README.md @@ -25,7 +25,7 @@ Please note that the Google Cloud C++ client libraries do **not** follow [doxygen-link]: https://googleapis.dev/cpp/google-cloud-bigtable/latest/ [cloud-bigtable-docs]: https://cloud.google.com/bigtable/docs/ -[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/master/google/cloud/bigtable +[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud/bigtable ## Quickstart diff --git a/google/cloud/pubsub/README.md b/google/cloud/pubsub/README.md index 10e01690f9fe..e9f0756e4292 100644 --- a/google/cloud/pubsub/README.md +++ b/google/cloud/pubsub/README.md @@ -25,7 +25,7 @@ Please note that the Google Cloud C++ client libraries do **not** follow [doxygen-link]: https://googleapis.dev/cpp/google-cloud-pubsub/latest/ [cloud-spanner-docs]: https://cloud.google.com/pubsub/docs/ -[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/master/google/cloud/pubsub +[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud/pubsub ## Quickstart diff --git a/google/cloud/spanner/README.md b/google/cloud/spanner/README.md index b24f2e8903ea..ff691439fe4c 100644 --- a/google/cloud/spanner/README.md +++ b/google/cloud/spanner/README.md @@ -25,7 +25,7 @@ Please note that the Google Cloud C++ client libraries do **not** follow [doxygen-link]: https://googleapis.dev/cpp/google-cloud-spanner/latest/ [cloud-spanner-docs]: https://cloud.google.com/spanner/docs/ -[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/master/google/cloud/spanner +[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud/spanner ## Quickstart diff --git a/google/cloud/spanner/options.cc b/google/cloud/spanner/options.cc index 893f4eea75a6..e8cd4dd99f2b 100644 --- a/google/cloud/spanner/options.cc +++ b/google/cloud/spanner/options.cc @@ -22,7 +22,7 @@ inline namespace SPANNER_CLIENT_NS { // This empty .cc file eliminated false positive errors from clang-tidy in our // presubmit CI. Not exactly sure why, but I was able to reproduce the error // locally with: -// $ KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH=master +// $ KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH=main // KOKORO_JOB_TYPE=PRESUBMIT_GITHUB // ./ci/kokoro/docker/build.sh clang-tidy diff --git a/google/cloud/storage/README.md b/google/cloud/storage/README.md index b0babe6b5bd8..b0938535945e 100644 --- a/google/cloud/storage/README.md +++ b/google/cloud/storage/README.md @@ -28,7 +28,7 @@ Please note that the Google Cloud C++ client libraries do **not** follow [doxygen-link]: https://googleapis.dev/cpp/google-cloud-storage/latest/ [cloud-storage-docs]: https://cloud.google.com/storage/docs/ -[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/master/google/cloud/storage +[source-link]: https://github.com/googleapis/google-cloud-cpp/tree/main/google/cloud/storage ## Quickstart diff --git a/release/README.md b/release/README.md index eaa10d6606e4..6fa3a2f3294e 100644 --- a/release/README.md +++ b/release/README.md @@ -18,7 +18,7 @@ release notes. ### Verify CI passing Before beginning the release process, verify all CI builds are passing on -master. +main. ### Update the API baseline @@ -44,36 +44,36 @@ Spanner, and the common libraries: ```bash # Summarize the output of this into CHANGELOG.md under the "Bigtable" header git log --no-merges --format="format:* %s" \ - $(git describe --tags --abbrev=0 upstream/master)..HEAD \ - upstream/master -- google/cloud/bigtable + $(git describe --tags --abbrev=0 upstream/main)..HEAD \ + upstream/main -- google/cloud/bigtable ``` ```bash # Summarize the output of this into CHANGELOG.md under the "Pub/Sub" header git log --no-merges --format="format:* %s" \ - $(git describe --tags --abbrev=0 upstream/master)..HEAD \ - upstream/master -- google/cloud/pubsub + $(git describe --tags --abbrev=0 upstream/main)..HEAD \ + upstream/main -- google/cloud/pubsub ``` ```bash # Summarize the output of this into CHANGELOG.md under the "Storage" header git log --no-merges --format="format:* %s" \ - $(git describe --tags --abbrev=0 upstream/master)..HEAD \ - upstream/master -- google/cloud/storage + $(git describe --tags --abbrev=0 upstream/main)..HEAD \ + upstream/main -- google/cloud/storage ``` ```bash # Summarize the output of this into CHANGELOG.md under the "Spanner" header git log --no-merges --format="format:* %s" \ - $(git describe --tags --abbrev=0 upstream/master)..HEAD \ - upstream/master -- google/cloud/spanner + $(git describe --tags --abbrev=0 upstream/main)..HEAD \ + upstream/main -- google/cloud/spanner ``` ```bash # Summarize the output of this into CHANGELOG.md under the "Common libraries" header git log --no-merges --format="format:* %s" \ - $(git describe --tags --abbrev=0 upstream/master)..HEAD \ - upstream/master -- google/cloud \ + $(git describe --tags --abbrev=0 upstream/main)..HEAD \ + upstream/main -- google/cloud \ ':(exclude)google/cloud/firestore/' \ ':(exclude)google/cloud/bigtable/' \ ':(exclude)google/cloud/pubsub/' \ @@ -96,7 +96,7 @@ to create the release at an specific point in the revision history. We next need to create the release tag, the release branch, and create the release in the GitHub UI. These steps are handled automatically for us by the [`./release/release.sh` -script](https://github.com/googleapis/google-cloud-cpp/blob/master/release/release.sh). +script](https://github.com/googleapis/google-cloud-cpp/blob/main/release/release.sh). *No PR is needed for this step.* @@ -139,11 +139,11 @@ It can take up to an hour after the build finishes for the new docs to show up at the above URLs. You can watch the status of the build at https://console.cloud.google.com/cloud-build/builds?project=cloud-cpp-testing-resources&query=tags%3D%22publish-docs%22 -## Bump the version numbers in `master` +## Bump the version numbers in `main` Working in your fork of `google-cloud-cpp`: bump the version numbers to the *next* version (i.e., one version past the release you just did above), and -send the PR for review against `master` You need to: +send the PR for review against `main` You need to: - Update the version numbers in the top-level `CMakeLists.txt` file. - Run the cmake configuration step, this will update the different @@ -158,7 +158,7 @@ We use the [GitHub Branch Settings][github-branch-settings] to protect the release branches against accidental mistakes. From time to time changes in the release branch naming conventions may require you to change these settings. Please note that we use more strict settings for release branches than for -`master`, in particular: +`main`, in particular: * We require at least one review, but stale reviews are dismissed. * The `Require status checks to pass before merging` option is set. diff --git a/release/release.sh b/release/release.sh index 6a4a2f07fe33..43751d8481b7 100755 --- a/release/release.sh +++ b/release/release.sh @@ -25,7 +25,7 @@ # 4. Creates the "Pre-Release" in the GitHub UI. # # Before running this script the user should make sure the CHANGELOG.md on -# master is up-to-date with the release notes for the new release that will +# main is up-to-date with the release notes for the new release that will # happen. Then run this script. After running this script, the user must still # go to the GH UI where the new release will exist as a "pre-release", and edit # the release notes. @@ -170,7 +170,7 @@ hub clone --shallow-since="${SINCE}" "${PROJECT_ARG}" "${REPO_DIR}" cd "${REPO_DIR}" # Figures out the most recent tagged version, and computes the next version. -readonly TAG="$(git describe --tags --abbrev=0 origin/master)" +readonly TAG="$(git describe --tags --abbrev=0 origin/main)" readonly CUR_TAG="$(test -n "${TAG}" && echo "${TAG}" || echo "v0.0.0")" readonly CUR_VERSION="${CUR_TAG#v}"