chore: prepare for v2.22.1 (#15025)

* chore: prepare for v2.22.1

* Updated GCB triggers

* revert changes to typos

Author: scotthart

.github/ISSUE_TEMPLATE/feature_request.md

@@ -11,8 +11,7 @@ example, is this related to bigtable (i.e., something in
 `google/cloud/bigtable`), or GCS (i.e., something in `google/cloud/storage`)?
 
 **Is your feature request related to a problem? Please describe.** A clear and
-concise description of what the problem is. Ex. I'm always frustrated when
-\[...\]
+concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 **Describe the solution you'd like** A clear and concise description of what you
 want to happen.

CHANGELOG.md

@@ -4,6 +4,8 @@
 breaking changes in the upcoming 3.x release. This release is scheduled for
 2024-12 or 2025-01.
 
+## v2.22.1 - TBD
+
 ## v2.22.0 - 2024-03
 
 ### New Libraries

CMakeLists.txt

@@ -21,9 +21,9 @@ set(PACKAGE_BUGREPORT "https://github.com/googleapis/google-cloud-cpp/issues")
 
 project(
     google-cloud-cpp
-    VERSION 2.22.0
+    VERSION 2.22.1
     LANGUAGES CXX)
-set(PROJECT_VERSION_PRE_RELEASE "")
+set(PROJECT_VERSION_PRE_RELEASE "rc")
 
 if (NOT "${PROJECT_VERSION_PRE_RELEASE}" STREQUAL "")
     set(PROJECT_VERSION "${PROJECT_VERSION}-${PROJECT_VERSION_PRE_RELEASE}")

README.md

@@ -78,16 +78,6 @@ readonly TIMEFORMAT="... %R seconds"
 # https://github.com/googleapis/google-cloud-cpp/issues/4152
 enable -n printf
 
-# Check for typos first so we don't generate more new files w/ the same typos.
-printf "%-50s" "Running typos:" >&2
-time {
-  # See https://github.com/crate-ci/typos for more details.
-  # A couple useful invocations:
-  #  $ typos --write-changes  # writes spelling fixes back to disk
-  #  $ typos --dump-config -  # dumps effective config to stdout
-  typos
-}
-
 printf "%-50s" "Running check-include-guards:" >&2
 time {
   git_files -z -- '*.h' |

ci/cloudbuild/builds/checkers.sh

@@ -35,8 +35,6 @@ RUN dnf makecache && \
         python-pip \
         ShellCheck
 
-RUN cargo install typos-cli --version 1.16.1 --root /usr/local
-
 RUN curl -L -o /usr/bin/buildifier https://github.com/bazelbuild/buildtools/releases/download/v6.4.0/buildifier-linux-amd64 && \
     chmod 755 /usr/bin/buildifier
 

ci/cloudbuild/dockerfiles/checkers.Dockerfile

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 45fd50c2-04f1-4674-b533-0db1346c8b7e
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: asan-pr
+name: v2-22-x-asan-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/45fd50c2-04f1-4674-b533-0db1346c8b7e
 substitutions:
   _BUILD_NAME: asan

ci/cloudbuild/triggers/asan-pr.yaml

@@ -4,10 +4,10 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   push:
-    branch: ^main$
+    branch: v2.22.x
 id: 3a7690ee-a385-4e86-835e-990a64eb71d7
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-oldest-ci
+name: v2-22-x-bazel-oldest-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/3a7690ee-a385-4e86-835e-990a64eb71d7
 substitutions:
   _BUILD_NAME: bazel-oldest

ci/cloudbuild/triggers/bazel-oldest-ci.yaml

@@ -4,11 +4,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: 914bc7a4-afa2-4faf-8a0e-571218e8fd83
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-oldest-pr
+name: v2-22-x-bazel-oldest-pr
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/914bc7a4-afa2-4faf-8a0e-571218e8fd83
 substitutions:
   _BUILD_NAME: bazel-oldest

ci/cloudbuild/triggers/bazel-oldest-pr.yaml

@@ -3,11 +3,11 @@ github:
   name: google-cloud-cpp
   owner: googleapis
   pullRequest:
-    branch: ^main$
+    branch: v2.22.x
     commentControl: COMMENTS_ENABLED_FOR_EXTERNAL_CONTRIBUTORS_ONLY
 id: abfbaa6f-e1a0-4298-af45-78f9dc1a9831
 includeBuildLogs: INCLUDE_BUILD_LOGS_WITH_STATUS
-name: bazel-otel-abi-2-ci
+name: v2-22-x-bazel-otel-abi-2-ci
 resourceName: projects/cloud-cpp-testing-resources/locations/global/triggers/abfbaa6f-e1a0-4298-af45-78f9dc1a9831
 substitutions:
   _BUILD_NAME: bazel-otel-abi-2