Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: patch releases do not change the ABI #11499

Merged
merged 2 commits into from
May 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ci/abi-dumps/google_cloud_cpp_accessapproval.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_alloydb.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_apigateway.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_apigeeconnect.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_apikeys.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_appengine.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_asset.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_automl.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_batch.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_beyondcorp.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_bigquery.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_bigtable.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_billing.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_channel.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_cloudbuild.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_common.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_composer.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_connectors.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_container.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_dataplex.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_dataproc.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_datastream.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_debugger.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_deploy.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_dlp.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_documentai.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_eventarc.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_filestore.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_functions.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_gkehub.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_grpc_utils.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_iam.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_iap.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_ids.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_iot.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_kms.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_language.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_logging.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_memcache.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_monitoring.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_notebooks.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_optimization.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_orgpolicy.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_osconfig.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_oslogin.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_privateca.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_profiler.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_pubsub.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_recommender.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_redis.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_retail.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_run.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_scheduler.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_secretmanager.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_securitycenter.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_servicecontrol.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_serviceusage.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_shell.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_spanner.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_speech.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_storage.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_talent.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_tasks.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_texttospeech.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_tpu.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_trace.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_translate.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_video.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_vision.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_vmmigration.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_vpcaccess.expected.abi.dump.gz
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_webrisk.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
Binary file modified ci/abi-dumps/google_cloud_cpp_workflows.expected.abi.dump.gz
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion google/cloud/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "google/cloud/internal/version_info.h"
#include <string>

#define GOOGLE_CLOUD_CPP_VCONCAT(Ma, Mi, Pa) v##Ma##_##Mi##_##Pa
#define GOOGLE_CLOUD_CPP_VCONCAT(Ma, Mi, Pa) v##Ma##_##Mi
#define GOOGLE_CLOUD_CPP_VEVAL(Ma, Mi, Pa) GOOGLE_CLOUD_CPP_VCONCAT(Ma, Mi, Pa)
#define GOOGLE_CLOUD_CPP_NS \
GOOGLE_CLOUD_CPP_VEVAL(GOOGLE_CLOUD_CPP_VERSION_MAJOR, \
Comment on lines +23 to 26
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps we should also not pass GOOGLE_CLOUD_CPP_VERSION_PATCH to GOOGLE_CLOUD_CPP_VEVAL (and GOOGLE_CLOUD_CPP_VCONCAT)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps. <lawyerly>In an abundance of caution I decided to keep the macros backwards compatible, because it is not clear if they are part of the public API or not.</lawerly>. Thoughts?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack.

But while it might be a little hazy whether GOOGLE_CLOUD_CPP_NS itself is public, hopefully VEVAL and VCONCAT are more clearly implementation details. We should have put "INTERNAL" in their names I guess.

In the end though, I'm happy with your abundance of caution if you're unconvinced.

Expand Down