From 234103284d596b3a876a3a5fa50758725f80d00a Mon Sep 17 00:00:00 2001 From: Moreno Ambrosin Date: Tue, 23 Apr 2024 12:39:12 +0000 Subject: [PATCH 01/10] Add tink-cc@2.1.2 to BCR --- modules/tink_cc/2.1.2/MODULE.bazel | 32 +++++++++++++++++++++++++++++ modules/tink_cc/2.1.2/presubmit.yml | 10 +++++++++ modules/tink_cc/2.1.2/source.json | 6 ++++++ modules/tink_cc/metadata.json | 16 +++++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 modules/tink_cc/2.1.2/MODULE.bazel create mode 100644 modules/tink_cc/2.1.2/presubmit.yml create mode 100644 modules/tink_cc/2.1.2/source.json create mode 100644 modules/tink_cc/metadata.json diff --git a/modules/tink_cc/2.1.2/MODULE.bazel b/modules/tink_cc/2.1.2/MODULE.bazel new file mode 100644 index 00000000000..f5fd40510d5 --- /dev/null +++ b/modules/tink_cc/2.1.2/MODULE.bazel @@ -0,0 +1,32 @@ +# Copyright 2023 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Tink C++ Bazel Module definition.""" +module( + name = "tink_cc", + version = "2.1.0", +) + +bazel_dep(name = "rules_cc", version = "0.0.5") +bazel_dep(name = "rules_proto", version = "5.3.0-21.7") +bazel_dep(name = "platforms", version = "0.0.6") +bazel_dep(name = "bazel_skylib", version = "1.3.0") +bazel_dep(name = "googletest", version = "1.12.1", repo_name = "com_google_googletest") +bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf") +bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014") +bazel_dep(name = "rapidjson", version = "1.1.0") +bazel_dep(name = "abseil-cpp", version = "20230802.0", repo_name="com_google_absl") + +wycheproof_extension = use_extension("//:extensions.bzl", "wycheproof_extension") +use_repo(wycheproof_extension, "wycheproof") diff --git a/modules/tink_cc/2.1.2/presubmit.yml b/modules/tink_cc/2.1.2/presubmit.yml new file mode 100644 index 00000000000..ea601802e52 --- /dev/null +++ b/modules/tink_cc/2.1.2/presubmit.yml @@ -0,0 +1,10 @@ +build_targets: &build_targets +- '@tink-cc//tink:tink_cc' + +platforms: + debian10: + build_targets: *build_targets + macos: + build_targets: *build_targets + ubuntu2004: + build_targets: *build_targets diff --git a/modules/tink_cc/2.1.2/source.json b/modules/tink_cc/2.1.2/source.json new file mode 100644 index 00000000000..53381168bae --- /dev/null +++ b/modules/tink_cc/2.1.2/source.json @@ -0,0 +1,6 @@ +{ + "url": "https://github.com/tink-crypto/tink-cc/releases/download/v2.1.2/tink-cc-2.1.2.zip", + "integrity": "sha256-0P78YeO951jIdz8TSOamT8T9bsr+YsStwN+JV86AB1c=", + "strip_prefix": "tink-cc-2.1.2", + "patch_strip": 1 +} diff --git a/modules/tink_cc/metadata.json b/modules/tink_cc/metadata.json new file mode 100644 index 00000000000..04622691139 --- /dev/null +++ b/modules/tink_cc/metadata.json @@ -0,0 +1,16 @@ +{ + "homepage": "https://github.com/tink-crypto/tink-cc", + "maintainers": [ + { + "email": "bcr-maintainers@bazel.build", + "name": "No Maintainer Specified" + } + ], + "repository": [ + "github:tink-crypto/tink-cc" + ], + "versions": [ + "2.1.2" + ], + "yanked_versions": {} +} From 1da87d878dc3d207d556af64eae15650ddd7c18d Mon Sep 17 00:00:00 2001 From: Moreno Ambrosin Date: Tue, 23 Apr 2024 13:35:57 +0000 Subject: [PATCH 02/10] Add maintainer and use correct format for presubmit --- modules/tink_cc/2.1.2/presubmit.yml | 22 ++++++++++++---------- modules/tink_cc/metadata.json | 5 +++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/modules/tink_cc/2.1.2/presubmit.yml b/modules/tink_cc/2.1.2/presubmit.yml index ea601802e52..73035d8d6d9 100644 --- a/modules/tink_cc/2.1.2/presubmit.yml +++ b/modules/tink_cc/2.1.2/presubmit.yml @@ -1,10 +1,12 @@ -build_targets: &build_targets -- '@tink-cc//tink:tink_cc' - -platforms: - debian10: - build_targets: *build_targets - macos: - build_targets: *build_targets - ubuntu2004: - build_targets: *build_targets +matrix: + platform: + - ubuntu2004 + - macos + bazel: [6.x] +tasks: + verify_targets: + name: Verify tink-cc build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - '@tink-cc//tink:tink_cc' diff --git a/modules/tink_cc/metadata.json b/modules/tink_cc/metadata.json index 04622691139..844f53e8882 100644 --- a/modules/tink_cc/metadata.json +++ b/modules/tink_cc/metadata.json @@ -2,8 +2,9 @@ "homepage": "https://github.com/tink-crypto/tink-cc", "maintainers": [ { - "email": "bcr-maintainers@bazel.build", - "name": "No Maintainer Specified" + "email": "ambrosin@google.com", + "github": "morambro", + "name": "Moreno Ambrosin" } ], "repository": [ From fea33005e19b53d75a2ccb6b66b7f07f47c6f9a1 Mon Sep 17 00:00:00 2001 From: Moreno Ambrosin Date: Tue, 23 Apr 2024 13:46:40 +0000 Subject: [PATCH 03/10] Add windows to the list of test platforms --- modules/tink_cc/2.1.2/presubmit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/tink_cc/2.1.2/presubmit.yml b/modules/tink_cc/2.1.2/presubmit.yml index 73035d8d6d9..95ce52908bf 100644 --- a/modules/tink_cc/2.1.2/presubmit.yml +++ b/modules/tink_cc/2.1.2/presubmit.yml @@ -2,6 +2,7 @@ matrix: platform: - ubuntu2004 - macos + - windows bazel: [6.x] tasks: verify_targets: From 1c84ce4240df59de38d72f370048832e2b21b8fe Mon Sep 17 00:00:00 2001 From: Moreno Ambrosin Date: Tue, 23 Apr 2024 13:51:03 +0000 Subject: [PATCH 04/10] Add Bazel 7.x to the list of test versions --- modules/tink_cc/2.1.2/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tink_cc/2.1.2/presubmit.yml b/modules/tink_cc/2.1.2/presubmit.yml index 95ce52908bf..ce8b2c9ccff 100644 --- a/modules/tink_cc/2.1.2/presubmit.yml +++ b/modules/tink_cc/2.1.2/presubmit.yml @@ -3,7 +3,7 @@ matrix: - ubuntu2004 - macos - windows - bazel: [6.x] + bazel: [6.x, 7.x] tasks: verify_targets: name: Verify tink-cc build targets From b3f36dcbd9ec677f8111b25278e4b4f1022f783d Mon Sep 17 00:00:00 2001 From: Moreno Ambrosin Date: Tue, 23 Apr 2024 18:13:10 +0000 Subject: [PATCH 05/10] Add 2.1.3 instead which fixes the wrong version in MODULE.bazel --- modules/tink_cc/2.1.2/source.json | 6 ------ modules/tink_cc/{2.1.2 => 2.1.3}/MODULE.bazel | 2 +- modules/tink_cc/{2.1.2 => 2.1.3}/presubmit.yml | 0 modules/tink_cc/2.1.3/source.json | 6 ++++++ modules/tink_cc/metadata.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 modules/tink_cc/2.1.2/source.json rename modules/tink_cc/{2.1.2 => 2.1.3}/MODULE.bazel (98%) rename modules/tink_cc/{2.1.2 => 2.1.3}/presubmit.yml (100%) create mode 100644 modules/tink_cc/2.1.3/source.json diff --git a/modules/tink_cc/2.1.2/source.json b/modules/tink_cc/2.1.2/source.json deleted file mode 100644 index 53381168bae..00000000000 --- a/modules/tink_cc/2.1.2/source.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "url": "https://github.com/tink-crypto/tink-cc/releases/download/v2.1.2/tink-cc-2.1.2.zip", - "integrity": "sha256-0P78YeO951jIdz8TSOamT8T9bsr+YsStwN+JV86AB1c=", - "strip_prefix": "tink-cc-2.1.2", - "patch_strip": 1 -} diff --git a/modules/tink_cc/2.1.2/MODULE.bazel b/modules/tink_cc/2.1.3/MODULE.bazel similarity index 98% rename from modules/tink_cc/2.1.2/MODULE.bazel rename to modules/tink_cc/2.1.3/MODULE.bazel index f5fd40510d5..de0136edb1b 100644 --- a/modules/tink_cc/2.1.2/MODULE.bazel +++ b/modules/tink_cc/2.1.3/MODULE.bazel @@ -15,7 +15,7 @@ """Tink C++ Bazel Module definition.""" module( name = "tink_cc", - version = "2.1.0", + version = "2.1.3", ) bazel_dep(name = "rules_cc", version = "0.0.5") diff --git a/modules/tink_cc/2.1.2/presubmit.yml b/modules/tink_cc/2.1.3/presubmit.yml similarity index 100% rename from modules/tink_cc/2.1.2/presubmit.yml rename to modules/tink_cc/2.1.3/presubmit.yml diff --git a/modules/tink_cc/2.1.3/source.json b/modules/tink_cc/2.1.3/source.json new file mode 100644 index 00000000000..f9bc30a438d --- /dev/null +++ b/modules/tink_cc/2.1.3/source.json @@ -0,0 +1,6 @@ +{ + "url": "https://github.com/tink-crypto/tink-cc/releases/download/v2.1.3/tink-cc-2.1.3.zip", + "integrity": "sha256-FKP2SlbX6Sloidfrp6O4eHwygeW8V5EDPFS6+BCgtu8=", + "strip_prefix": "tink-cc-2.1.3", + "patch_strip": 1 +} diff --git a/modules/tink_cc/metadata.json b/modules/tink_cc/metadata.json index 844f53e8882..468c74fdada 100644 --- a/modules/tink_cc/metadata.json +++ b/modules/tink_cc/metadata.json @@ -11,7 +11,7 @@ "github:tink-crypto/tink-cc" ], "versions": [ - "2.1.2" + "2.1.3" ], "yanked_versions": {} } From 9a97689a6f812f3e1eecf0e314c0c073c6bf6554 Mon Sep 17 00:00:00 2001 From: Moreno Ambrosin Date: Tue, 23 Apr 2024 18:18:46 +0000 Subject: [PATCH 06/10] Fix typo in repo name --- modules/tink_cc/2.1.3/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tink_cc/2.1.3/presubmit.yml b/modules/tink_cc/2.1.3/presubmit.yml index ce8b2c9ccff..6665569b115 100644 --- a/modules/tink_cc/2.1.3/presubmit.yml +++ b/modules/tink_cc/2.1.3/presubmit.yml @@ -10,4 +10,4 @@ tasks: platform: ${{ platform }} bazel: ${{ bazel }} build_targets: - - '@tink-cc//tink:tink_cc' + - '@tink_cc//tink:tink_cc' From 24820ff6aed4b1f42ad1dcb9a89609c08724f883 Mon Sep 17 00:00:00 2001 From: Moreno Ambrosin Date: Wed, 24 Apr 2024 07:47:04 +0000 Subject: [PATCH 07/10] Add build flags to force C++14 in presubmit --- modules/tink_cc/2.1.3/presubmit.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/tink_cc/2.1.3/presubmit.yml b/modules/tink_cc/2.1.3/presubmit.yml index 6665569b115..9bf16b99f5e 100644 --- a/modules/tink_cc/2.1.3/presubmit.yml +++ b/modules/tink_cc/2.1.3/presubmit.yml @@ -9,5 +9,7 @@ tasks: name: Verify tink-cc build targets platform: ${{ platform }} bazel: ${{ bazel }} + build_flags: + - '--cxxopt=-std=c++14' build_targets: - '@tink_cc//tink:tink_cc' From ebdebecb085cdfe0beb7514221f3528fee084eef Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Wed, 24 Apr 2024 11:19:02 +0200 Subject: [PATCH 08/10] Update presubmit.yml for macOS --- modules/tink_cc/2.1.3/presubmit.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/tink_cc/2.1.3/presubmit.yml b/modules/tink_cc/2.1.3/presubmit.yml index 9bf16b99f5e..80b13a4ad22 100644 --- a/modules/tink_cc/2.1.3/presubmit.yml +++ b/modules/tink_cc/2.1.3/presubmit.yml @@ -1,7 +1,6 @@ matrix: platform: - ubuntu2004 - - macos - windows bazel: [6.x, 7.x] tasks: @@ -13,3 +12,12 @@ tasks: - '--cxxopt=-std=c++14' build_targets: - '@tink_cc//tink:tink_cc' +verify_targets_macos: + name: Verify tink-cc build targets (macOS) + platform: macos + bazel: ${{ bazel }} + build_flags: + - '--cxxopt=-std=c++14' + - "--copt=-isystem/usr/local/include" + build_targets: + - '@tink_cc//tink:tink_cc' From 76695b2ae3ec83164847fa5efb5979820b413f05 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Wed, 24 Apr 2024 11:20:25 +0200 Subject: [PATCH 09/10] Update presubmit.yml --- modules/tink_cc/2.1.3/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tink_cc/2.1.3/presubmit.yml b/modules/tink_cc/2.1.3/presubmit.yml index 80b13a4ad22..d71a38d2ead 100644 --- a/modules/tink_cc/2.1.3/presubmit.yml +++ b/modules/tink_cc/2.1.3/presubmit.yml @@ -12,7 +12,7 @@ tasks: - '--cxxopt=-std=c++14' build_targets: - '@tink_cc//tink:tink_cc' -verify_targets_macos: + verify_targets_macos: name: Verify tink-cc build targets (macOS) platform: macos bazel: ${{ bazel }} From e84b1127e91cb52133407a4437de47b86c94832c Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Wed, 24 Apr 2024 11:28:51 +0200 Subject: [PATCH 10/10] Only test macOS with 7.x --- modules/tink_cc/2.1.3/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tink_cc/2.1.3/presubmit.yml b/modules/tink_cc/2.1.3/presubmit.yml index d71a38d2ead..7632d679dc5 100644 --- a/modules/tink_cc/2.1.3/presubmit.yml +++ b/modules/tink_cc/2.1.3/presubmit.yml @@ -15,7 +15,7 @@ tasks: verify_targets_macos: name: Verify tink-cc build targets (macOS) platform: macos - bazel: ${{ bazel }} + bazel: 7.x build_flags: - '--cxxopt=-std=c++14' - "--copt=-isystem/usr/local/include"