Skip to content

Commit ee01b60

Browse files
pcjpcj
authored
bazel 6.4.0, rules_go v0.45, bazel-gazelle 0.35, more... (#355)
* Convert to yaml config * Vendor timestamp.proto (for ts_proto) * Switch to proto_gazelle rule * Fix missing NonEmptyAttrs * Reset baseline generated rules using proto_gazelle * Upgrade rules_go, gazelle, go_deps * Upgrade gazelle to v0.35.0 * Migrate resolver to accomodate bazel-contrib/bazel-gazelle#1687 * checkpoint migrate to protobuf-javascript * Use java 17, upgrade rules_scala, custom toolchain * sync scala version * Upgrade rules_python and add to WORKSPACE boilerplate files * Add :protobuf_python to example deps * ensure strings sorted for import labels * Upgrade rules_go to v0.45.1 * exclude grpc_test.go from default go_test rule * remove obsolete patch * Add "make golden_test" target * ensure reassign memory value * Update build status badge * preserve last-wins semantics of prior stackb/rules_proto behavior * Update release.yaml
1 parent 2fce35e commit ee01b60

File tree

476 files changed

+7544
-17499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

476 files changed

+7544
-17499
lines changed

‎.bazelrc‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
common --enable_platform_specific_config
21

2+
common --jvmopt=-Djava.security.manager=allow
3+
build --java_language_version=17
4+
build --java_runtime_version=remotejdk_17
5+
build --tool_java_language_version=17
6+
build --tool_java_runtime_version=remotejdk_17
7+
8+
common --enable_platform_specific_config
39
build:windows --cxxopt='/std:c++14'
410
build:windows --host_cxxopt='/std:c++14'
5-
build:linux --cxxopt='-std=c++14'
6-
build:linux --host_cxxopt='-std=c++14'
7-
build:macos --cxxopt='-std=c++14'
8-
build:macos --host_cxxopt='-std=c++14'
9-
build:freebsd --cxxopt='-std=c++14'
10-
build:freebsd --host_cxxopt='-std=c++14'
11+
build:linux --cxxopt='-std=c++14'
12+
build:linux --host_cxxopt='-std=c++14'
13+
build:macos --cxxopt='-std=c++14'
14+
build:macos --host_cxxopt='-std=c++14'
15+
build:freebsd --cxxopt='-std=c++14'
16+
build:freebsd --host_cxxopt='-std=c++14'
1117

1218
build:bazelci --deleted_packages=docs
1319

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.4.0
1+
6.4.0

‎.github/workflows/ci.bazelrc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# This file contains Bazel settings to apply on CI only.
2+
# It is referenced with a --bazelrc option in the call to bazel in ci.yaml
3+
# Debug where options came from
4+
build --announce_rc
5+
# Don't rely on test logs being easily accessible from the test runner,
6+
# though it makes the log noisier.
7+
test --test_output=errors
8+
# This directory is configured in GitHub actions to be persisted between runs.
9+
build --disk_cache=$HOME/.cache/bazel
10+
build --repository_cache=$HOME/.cache/bazel-repo
11+
# Allows tests to run bazelisk-in-bazel, since this is the cache folder used
12+
test --test_env=XDG_CACHE_HOME
13+
# Keep until @io_bazel_rules_scala is upgraded
14+
build --incompatible_java_common_parameters=false

‎.github/workflows/ci.yaml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: CI
2+
3+
# Controls when the action will run.
4+
on:
5+
# Triggers the workflow on push or pull request events but only for the master branch
6+
push:
7+
branches: [master]
8+
pull_request:
9+
branches: [master]
10+
11+
# Allows you to run this workflow manually from the Actions tab
12+
workflow_dispatch:
13+
14+
jobs:
15+
test:
16+
# The type of runner that the job will run on
17+
runs-on: ubuntu-latest
18+
19+
# Steps represent a sequence of tasks that will be executed as part of the job
20+
steps:
21+
- uses: actions/checkout@v3
22+
23+
- uses: bazelbuild/setup-bazelisk@v2
24+
25+
- name: Mount bazel action cache
26+
uses: actions/cache@v3
27+
if: always()
28+
with:
29+
path: "~/.cache/bazel"
30+
key: bazel
31+
32+
- name: Mount bazel repo cache
33+
uses: actions/cache@v3
34+
if: always()
35+
with:
36+
path: "~/.cache/bazel-repo"
37+
key: bazel-repo
38+
39+
- name: bazel test
40+
env:
41+
# Bazelisk will download bazel to here, ensure it is cached between runs.
42+
XDG_CACHE_HOME: ~/.cache/bazel-repo
43+
run: >-
44+
bazel
45+
--bazelrc=.github/workflows/ci.bazelrc
46+
--bazelrc=.bazelrc
47+
test
48+
--deleted_packages=//plugin/grpc-ecosystem/grpc-gateway
49+
//example/...
50+
//pkg/...
51+
//plugin/...
52+
//language/...
53+
//rules/...
54+
//toolchain/...

‎.github/workflows/format.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Format
2+
3+
# Controls when the action will run.
4+
on:
5+
# Triggers the workflow on push or pull request events but only for the main branch
6+
push:
7+
branches: [main]
8+
pull_request:
9+
branches: [main]
10+
11+
# Allows you to run this workflow manually from the Actions tab
12+
workflow_dispatch:
13+
14+
jobs:
15+
test:
16+
# The type of runner that the job will run on
17+
runs-on: ubuntu-latest
18+
19+
# Steps represent a sequence of tasks that will be executed as part of the job
20+
steps:
21+
- uses: actions/checkout@v3
22+
23+
- uses: bazelbuild/setup-bazelisk@v2
24+
25+
- name: Mount bazel action cache
26+
uses: actions/cache@v2
27+
with:
28+
path: "~/.cache/bazel"
29+
key: bazel
30+
31+
- name: Mount bazel repo cache
32+
uses: actions/cache@v2
33+
with:
34+
path: "~/.cache/bazel-repo"
35+
key: bazel-repo
36+
37+
- name: Run format
38+
env:
39+
# Bazelisk will download bazel to here, ensure it is cached between runs.
40+
XDG_CACHE_HOME: ~/.cache/bazel-repo
41+
run: ./tools/format.sh
42+
43+
- name: Check no changes
44+
run: bash -c "if [[ $(git status --porcelain | wc -l) -gt 0 ]]; then echo >&2 'Please run \`./tools/format.sh\` - Found differences after formatting:' && git diff && exit 1; fi"

‎.github/workflows/release.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Cut a release whenever a new tag is pushed to the repo.
2+
name: Release
3+
4+
on:
5+
push:
6+
tags:
7+
- "v*.*.*"
8+
9+
# Allows owner to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
jobs:
13+
test:
14+
# The type of runner that the job will run on
15+
runs-on: ubuntu-latest
16+
17+
# Steps represent a sequence of tasks that will be executed as part of the job
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v3
21+
22+
- name: Prepare workspace snippet
23+
run: .github/workflows/workspace_snippet.sh ${{ env.GITHUB_REF_NAME }} > release_notes.txt
24+
25+
- name: Release
26+
uses: softprops/action-gh-release@v1
27+
with:
28+
prerelease: false
29+
# Use GH feature to populate the changelog automatically
30+
generate_release_notes: true
31+
body_path: release_notes.txt

‎.github/workflows/workspace_snippet.sh‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
set -eufo pipefail
3+
4+
# Set by GH actions, see
5+
# https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
6+
TAG=${GITHUB_REF_NAME}
7+
PREFIX="rules_proto-${TAG:1}"
8+
SHA=$(git archive --format=tar --prefix=${PREFIX}/ ${TAG} | gzip | shasum -a 256 | awk '{print $1}')
9+
10+
cat << EOF
11+
WORKSPACE snippet:
12+
\`\`\`starlark
13+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
14+
15+
http_archive(
16+
name = "build_stack_rules_proto",
17+
sha256 = "${SHA}",
18+
strip_prefix = "${PREFIX}",
19+
url = "https://github.com/stackb/rules_proto/archive/refs/tags/${TAG}.tar.gz",
20+
)
21+
\`\`\`
22+
EOF

‎BUILD.bazel‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
22
load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
33
load("@npm_ts_proto//:defs.bzl", "npm_link_all_packages")
4+
load("@//rules:proto_gazelle.bzl", "proto_gazelle")
5+
6+
exports_files(["rules_proto_config.yaml"])
47

58
# ----------------------------------------------------
69
# Buildifier
@@ -28,9 +31,14 @@ gazelle_binary(
2831
visibility = ["//visibility:public"],
2932
)
3033

31-
gazelle(
34+
proto_gazelle(
3235
name = "gazelle",
36+
cfgs = [":rules_proto_config.yaml"],
3337
gazelle = ":gazelle-protobuf",
38+
imports = [
39+
"@googleapis//:imports.csv",
40+
"@protoapis//:imports.csv",
41+
],
3442
)
3543

3644
gazelle(

‎Makefile‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
BAZEL := bzl
1+
BAZEL := bazel
22

33
.PHONY: tidy
44
tidy: deps
@@ -9,6 +9,10 @@ tidy: deps
99
$(BAZEL) run //:buildifier
1010
$(BAZEL) run //:gazelle
1111

12+
.PHONY: gazelle
13+
gazelle:
14+
$(BAZEL) run //:gazelle
15+
1216
.PHONY: deps
1317
deps:
1418
$(BAZEL) build //deps:*
@@ -21,9 +25,13 @@ site:
2125
$(BAZEL) build //example/golden:*
2226
cp -f ./bazel-bin/example/golden/*.md docs/
2327

28+
.PHONY: golden_test
29+
golden_test:
30+
$(BAZEL) test //example/golden:golden_test
31+
2432
.PHONY: test
2533
test:
26-
$(BAZEL) test //example/... //pkg/... //plugin/... //language/... //rules/... //toolchain/... \
34+
$(BAZEL) test --keep_going //example/... //pkg/... //plugin/... //language/... //rules/... //toolchain/... \
2735
--deleted_packages=//plugin/grpc-ecosystem/grpc-gateway
2836

2937
.PHONY: get

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# `rules_proto (v3)`
22

3-
[![Build status](https://badge.buildkite.com/5980cc1d55f96e721bd9a7bd5dc1e40a096a7c30bc13117910.svg?branch=master)](https://buildkite.com/bazel/stackb-rules-proto)
3+
![build-status](https://github.com/stackb/rules_proto/actions/workflows/ci.yaml/badge.svg)
44
[![Go Reference](https://pkg.go.dev/badge/github.com/stackb/rules_proto.svg)](https://pkg.go.dev/github.com/stackb/rules_proto)
55

66
Bazel starlark rules for building protocol buffers +/- gRPC :sparkles:.
@@ -597,7 +597,7 @@ proto_repository(
597597
build_file_generation = "clean",
598598
build_file_proto_mode = "file",
599599
reresolve_known_proto_imports = True,
600-
proto_language_config_file = "//example:config.yaml",
600+
proto_language_config_file = "@//:rules_proto_config.yaml",
601601
strip_prefix = "googleapis-02710fa0ea5312d79d7fb986c9c9823fb41049a9",
602602
type = "zip",
603603
urls = ["https://codeload.github.com/googleapis/googleapis/zip/02710fa0ea5312d79d7fb986c9c9823fb41049a9"],

0 commit comments

Comments
 (0)