bazel: bump Bazel repositories versions #3413
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I moved it to drafts as there are more problems to fix. |
adambabik
commented
Jul 23, 2023
| @@ -19,6 +19,18 @@ buildifier( | |||
| # gazelle:go_proto_compilers //:go_apiv2 | |||
| # gazelle:go_grpc_compilers //:go_apiv2, //:go_grpc | |||
| # gazelle:go_naming_convention import_alias | |||
| # gazelle:resolve proto proto google/api/annotations.proto @googleapis//google/api:annotations_proto | |||
There was a problem hiding this comment.
I am not sure if this is the best place for these directives.
There was a problem hiding this comment.
I will defer to @achew22 on this
There was a problem hiding this comment.
I think this is the correct place for them
| @@ -19,7 +19,7 @@ docker run -itv $(pwd):/grpc-gateway -w /grpc-gateway --entrypoint /bin/bash --r | |||
| ghcr.io/grpc-ecosystem/grpc-gateway/build-env:1.19 -c '\ | |||
| bazel run :gazelle -- update-repos -from_file=go.mod -to_macro=repositories.bzl%go_repositories && \ | |||
| bazel run :gazelle && \ | |||
| bazel run :buildifier' | |||
| BAZEL_CXXOPTS="-std=c++14" bazel run :buildifier' | |||
There was a problem hiding this comment.
Alternatively, we could put .bazelrc in the project root. I found that in ci.yml we are setting exactly the same env.
There was a problem hiding this comment.
We have various environment specific options like the CPU and memory limiters that shouldn't go in .bazelrc, but this option does seem like a reasonable thing to put in a repo wide .bazelrc.
There was a problem hiding this comment.
I would probably drop it in the .bazelrc,
build --cxxopt='-std=c++14'
but I have a pathological aversion to environment variables.
johanbrandhorst
approved these changes
Jul 23, 2023
achew22
approved these changes
Jul 24, 2023
| @@ -19,6 +19,18 @@ buildifier( | |||
| # gazelle:go_proto_compilers //:go_apiv2 | |||
| # gazelle:go_grpc_compilers //:go_apiv2, //:go_grpc | |||
| # gazelle:go_naming_convention import_alias | |||
| # gazelle:resolve proto proto google/api/annotations.proto @googleapis//google/api:annotations_proto | |||
There was a problem hiding this comment.
I think this is the correct place for them
| @@ -19,7 +19,7 @@ docker run -itv $(pwd):/grpc-gateway -w /grpc-gateway --entrypoint /bin/bash --r | |||
| ghcr.io/grpc-ecosystem/grpc-gateway/build-env:1.19 -c '\ | |||
| bazel run :gazelle -- update-repos -from_file=go.mod -to_macro=repositories.bzl%go_repositories && \ | |||
| bazel run :gazelle && \ | |||
| bazel run :buildifier' | |||
| BAZEL_CXXOPTS="-std=c++14" bazel run :buildifier' | |||
There was a problem hiding this comment.
I would probably drop it in the .bazelrc,
build --cxxopt='-std=c++14'
but I have a pathological aversion to environment variables.
| load("@googleapis//:repository_rules.bzl", "switched_rules_by_language") | ||
|
|
||
| switched_rules_by_language( | ||
| name = "com_google_googleapis_imports", |
There was a problem hiding this comment.
Don't you need to set go = true?
https://github.com/googleapis/googleapis/blob/master/repository_rules.bzl#L87
There was a problem hiding this comment.
It seems we don't need this, because we use @googleapis only in proto_library. Go deps are resolved to @org_golang_google_genproto_googleapis_api.
I suppose that I could change:
# gazelle:resolve proto go google/api/annotations.proto @org_golang_google_genproto_googleapis_api//annotations
to
# gazelle:resolve proto go google/api/annotations.proto @googleapis//google/api:annotations_go_proto
then go = True would be necessary. But I am not sure if it gives us any benefits. @org_golang_google_genproto_googleapis_api was recommended in go_rules and gazelle.
adambabik
force-pushed
the
fix-bazel-go_googleapis
branch
from
e162627
to
d650006
Compare
michaelkedar
pushed a commit
to google/osv.dev
that referenced
this pull request
Sep 11, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/grpc-ecosystem/grpc-gateway/v2](https://togithub.com/grpc-ecosystem/grpc-gateway) | require | minor | `v2.16.0` -> `v2.18.0` | | [google.golang.org/protobuf](https://togithub.com/protocolbuffers/protobuf-go) | require | minor | `v1.30.0` -> `v1.31.0` | | | | lockFileMaintenance | All locks refreshed | | [jekyll-feed](https://togithub.com/jekyll/jekyll-feed) | | minor | `0.15.1` -> `0.17.0` | --- ### Release Notes <details> <summary>grpc-ecosystem/grpc-gateway (github.com/grpc-ecosystem/grpc-gateway/v2)</summary> ### [`v2.18.0`](https://togithub.com/grpc-ecosystem/grpc-gateway/releases/tag/v2.18.0) [Compare Source](https://togithub.com/grpc-ecosystem/grpc-gateway/compare/v2.17.1...v2.18.0) #### What's Changed - Enable a few more golangci-lint linters by [@​pkwarren](https://togithub.com/pkwarren) in [grpc-ecosystem/grpc-gateway#3546 - Add .golangci.yml config by [@​pkwarren](https://togithub.com/pkwarren) in [grpc-ecosystem/grpc-gateway#3548 - Fix: path item objects become block scalars \[[#​3557](https://togithub.com/grpc-ecosystem/grpc-gateway/issues/3557)] by [@​qawatake](https://togithub.com/qawatake) in [grpc-ecosystem/grpc-gateway#3566 - Add remove_internal_comments option by [@​same-id](https://togithub.com/same-id) in [grpc-ecosystem/grpc-gateway#3560 #### New Contributors - [@​benjx1990](https://togithub.com/benjx1990) made their first contribution in [grpc-ecosystem/grpc-gateway#3552 - [@​qawatake](https://togithub.com/qawatake) made their first contribution in [grpc-ecosystem/grpc-gateway#3566 **Full Changelog**: grpc-ecosystem/grpc-gateway@v2.17.1...v2.18.0 ### [`v2.17.1`](https://togithub.com/grpc-ecosystem/grpc-gateway/releases/tag/v2.17.1) [Compare Source](https://togithub.com/grpc-ecosystem/grpc-gateway/compare/v2.17.0...v2.17.1) #### What's Changed - genopenapi: set source code info explicitly by [@​johanbrandhorst](https://togithub.com/johanbrandhorst) in [grpc-ecosystem/grpc-gateway#3544 - Record the filename of files that are missing SourceCodeInfo by [@​ebilling](https://togithub.com/ebilling) in [grpc-ecosystem/grpc-gateway#3545 #### New Contributors - [@​ebilling](https://togithub.com/ebilling) made their first contribution in [grpc-ecosystem/grpc-gateway#3545 **Full Changelog**: grpc-ecosystem/grpc-gateway@v2.17.0...v2.17.1 ### [`v2.17.0`](https://togithub.com/grpc-ecosystem/grpc-gateway/releases/tag/v2.17.0) [Compare Source](https://togithub.com/grpc-ecosystem/grpc-gateway/compare/v2.16.2...v2.17.0) #### What's Changed - Fix renovate.yml overwriting .bazelrc by [@​adambabik](https://togithub.com/adambabik) in [grpc-ecosystem/grpc-gateway#3451 - fix: successful typo by [@​testwill](https://togithub.com/testwill) in [grpc-ecosystem/grpc-gateway#3510 - Update example buf.gen.yaml by [@​pkwarren](https://togithub.com/pkwarren) in [grpc-ecosystem/grpc-gateway#3522 - fix(deps): replace all uses of golang/protobuf/protobuf by [@​aimuz](https://togithub.com/aimuz) in [grpc-ecosystem/grpc-gateway#3516 - Feature/issue 3051 swagger preserve rpc order by [@​CemGurhan](https://togithub.com/CemGurhan) in [grpc-ecosystem/grpc-gateway#3500 #### New Contributors - [@​testwill](https://togithub.com/testwill) made their first contribution in [grpc-ecosystem/grpc-gateway#3510 - [@​pkwarren](https://togithub.com/pkwarren) made their first contribution in [grpc-ecosystem/grpc-gateway#3522 - [@​aimuz](https://togithub.com/aimuz) made their first contribution in [grpc-ecosystem/grpc-gateway#3516 - [@​CemGurhan](https://togithub.com/CemGurhan) made their first contribution in [grpc-ecosystem/grpc-gateway#3500 **Full Changelog**: grpc-ecosystem/grpc-gateway@v2.16.2...v2.17.0 ### [`v2.16.2`](https://togithub.com/grpc-ecosystem/grpc-gateway/releases/tag/v2.16.2) [Compare Source](https://togithub.com/grpc-ecosystem/grpc-gateway/compare/v2.16.1...v2.16.2) #### What's Changed - chore: replace the Goreleaser's deprecated option `--rm-dist` to `--clean` by [@​suzuki-shunsuke](https://togithub.com/suzuki-shunsuke) in [grpc-ecosystem/grpc-gateway#3438 - chore: stop using the deprecated field `archives.replacements` by [@​suzuki-shunsuke](https://togithub.com/suzuki-shunsuke) in [grpc-ecosystem/grpc-gateway#3436 #### New Contributors - [@​suzuki-shunsuke](https://togithub.com/suzuki-shunsuke) made their first contribution in [grpc-ecosystem/grpc-gateway#3438 **Full Changelog**: grpc-ecosystem/grpc-gateway@v2.16.1...v2.16.2 ### [`v2.16.1`](https://togithub.com/grpc-ecosystem/grpc-gateway/releases/tag/v2.16.1) [Compare Source](https://togithub.com/grpc-ecosystem/grpc-gateway/compare/v2.16.0...v2.16.1) #### What's Changed - Rename LICENSE.txt to LICENSE by [@​pgmitche](https://togithub.com/pgmitche) in [grpc-ecosystem/grpc-gateway#3345 - feat: message supports enum field option for query params by [@​zhb127](https://togithub.com/zhb127) in [grpc-ecosystem/grpc-gateway#3352 - remove glog from a bunch of spots by [@​kn100](https://togithub.com/kn100) in [grpc-ecosystem/grpc-gateway#3361 - Improve AIP support in field_configuration.path_param_name containing by [@​same-id](https://togithub.com/same-id) in [grpc-ecosystem/grpc-gateway#3364 - Hide comments on omitted enum default values by [@​same-id](https://togithub.com/same-id) in [grpc-ecosystem/grpc-gateway#3366 - fix(docs): correcting mux routing error code example by [@​tjasko](https://togithub.com/tjasko) in [grpc-ecosystem/grpc-gateway#3409 - Fix the place where format property in placed for repeated fields by [@​far4599](https://togithub.com/far4599) in [grpc-ecosystem/grpc-gateway#3410 - Handle httpbody not having data to return by [@​achew22](https://togithub.com/achew22) in [grpc-ecosystem/grpc-gateway#3415 - bazel: bump Bazel repositories versions by [@​adambabik](https://togithub.com/adambabik) in [grpc-ecosystem/grpc-gateway#3413 #### New Contributors - [@​pgmitche](https://togithub.com/pgmitche) made their first contribution in [grpc-ecosystem/grpc-gateway#3345 - [@​zhb127](https://togithub.com/zhb127) made their first contribution in [grpc-ecosystem/grpc-gateway#3352 - [@​kn100](https://togithub.com/kn100) made their first contribution in [grpc-ecosystem/grpc-gateway#3361 - [@​tjasko](https://togithub.com/tjasko) made their first contribution in [grpc-ecosystem/grpc-gateway#3409 - [@​far4599](https://togithub.com/far4599) made their first contribution in [grpc-ecosystem/grpc-gateway#3410 **Full Changelog**: grpc-ecosystem/grpc-gateway@v2.16.0...v2.16.1 </details> <details> <summary>protocolbuffers/protobuf-go (google.golang.org/protobuf)</summary> ### [`v1.31.0`](https://togithub.com/protocolbuffers/protobuf-go/releases/tag/v1.31.0) [Compare Source](https://togithub.com/protocolbuffers/protobuf-go/compare/v1.30.0...v1.31.0) #### Notable changes <a name="v1.31-notable-changes"></a> **New Features** - [CL/489316](https://go.dev/cl/489316): types/dynamicpb: add NewTypes - Add a function to construct a dynamic type registry from a protoregistry.Files - [CL/489615](https://go.dev/cl/489615): encoding: add MarshalAppend to protojson and prototext **Minor performance improvements** - [CL/491596](https://go.dev/cl/491596): encoding/protodelim: If UnmarshalFrom gets a bufio.Reader, try to reuse its buffer instead of creating a new one - [CL/500695](https://go.dev/cl/500695): proto: store the size of tag to avoid multiple calculations **Bug fixes** - [CL/497935](https://go.dev/cl/497935): internal/order: fix sorting of synthetic oneofs to be deterministic - [CL/505555](https://go.dev/cl/505555): encoding/protodelim: fix handling of io.EOF </details> <details> <summary>jekyll/jekyll-feed (jekyll-feed)</summary> ### [`v0.17.0`](https://togithub.com/jekyll/jekyll-feed/blob/HEAD/History.markdown#0170--2022-10-14) [Compare Source](https://togithub.com/jekyll/jekyll-feed/compare/v0.16.0...v0.17.0) ##### Documentation - Update CI status badge ([#​363](https://togithub.com/jekyll/jekyll-feed/issues/363)) ##### Development Fixes - Add Ruby 3.1 to the CI matrix ([#​365](https://togithub.com/jekyll/jekyll-feed/issues/365)) ##### Minor Enhancements - Allow disabling of jekyll-feed while in development ([#​370](https://togithub.com/jekyll/jekyll-feed/issues/370)) ### [`v0.16.0`](https://togithub.com/jekyll/jekyll-feed/blob/HEAD/History.markdown#0160--2022-01-03) [Compare Source](https://togithub.com/jekyll/jekyll-feed/compare/v0.15.1...v0.16.0) ##### Minor Enhancements - Add support for `page.description` in front matter to become entry `<summary>` ([#​297](https://togithub.com/jekyll/jekyll-feed/issues/297)) ##### Bug Fixes - Fold private methods into the `:render` method as local variables ([#​327](https://togithub.com/jekyll/jekyll-feed/issues/327)) - Check `post.categories` instead of `post.category` ([#​357](https://togithub.com/jekyll/jekyll-feed/issues/357)) - Switched xml_escape for `<![CDATA[]]>` for post content ([#​332](https://togithub.com/jekyll/jekyll-feed/issues/332)) ##### Development Fixes - Add Ruby 3.0 to CI ([#​337](https://togithub.com/jekyll/jekyll-feed/issues/337)) - Lock RuboCop to v1.18.x ([#​348](https://togithub.com/jekyll/jekyll-feed/issues/348)) - Add workflow to release gem via GH Action ([#​355](https://togithub.com/jekyll/jekyll-feed/issues/355)) ##### Documentation - Use `.atom` extension in documented examples since we write an Atom feed ([#​359](https://togithub.com/jekyll/jekyll-feed/issues/359)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 6am on wednesday" in timezone Australia/Sydney, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/google/osv.dev). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi42OC4xIiwidXBkYXRlZEluVmVyIjoiMzYuODMuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->
](https://renovatebot.com){kind=link}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
References to other Issues or PRs
Hopefully fixes #3407
Brief description of what is fixed or changed
I had a problem to generate Bazel build files from main and noticed #3407. I bumped both
rules_goandgazellewhich resulted in getting rid of@go_googleapisreferences as expected.One more problem I had after bumping
rules_proto, which was also outdated, was that Bazel used older C++ standard by default. I enforced the C++14 withBAZEL_CXXOPTS="-std=c++14" bazel run :buildifier, however, there might be a better way to achieve this.