File tree Expand file tree Collapse file tree 6 files changed +45
-48842
lines changed Expand file tree Collapse file tree 6 files changed +45
-48842
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,6 @@ all: gen
22
22
23
23
repo_dir := .
24
24
25
- protolock = protolock
26
25
annotations_prep = annotations_prep
27
26
htmlproofer = htmlproofer
28
27
@@ -46,10 +45,13 @@ gen: \
46
45
generate-labels \
47
46
mirror-licenses \
48
47
tidy-go \
49
- proto-commit
48
+ breaking
50
49
51
50
gen-check : gen check-clean-repo
52
51
52
+ breaking :
53
+ @./scripts/breaking.sh $(UPDATE_BRANCH )
54
+
53
55
# ####################
54
56
# annotation/...
55
57
# ####################
@@ -84,19 +86,6 @@ generate-labels: $(labels_pb_go) $(labels_pb_doc)
84
86
clean-labels :
85
87
@rm -fr $(labels_pb_go ) $(labels_pb_doc )
86
88
87
- # ####################
88
- # Protolock
89
- # ####################
90
-
91
- proto-commit :
92
- @$(protolock ) commit
93
-
94
- proto-commit-force :
95
- @$(protolock ) commit --force
96
-
97
- proto-status :
98
- @$(protolock ) status
99
-
100
89
# ####################
101
90
# Misc
102
91
# ####################
@@ -109,7 +98,7 @@ local-lint-protos:
109
98
lint : lint-dockerfiles lint-scripts lint-yaml lint-helm lint-copyright-banner lint-go lint-python lint-markdown lint-sass lint-typescript lint-licenses local-lint-protos
110
99
@$(htmlproofer ) . --url-swap "istio.io :preliminary.istio.io" --assume-extension --check-html --check-external-hash --check-opengraph --timeframe 2d --storage-dir $(repo_dir ) /.htmlproofer --url-ignore "/localhost/"
111
100
112
- test :
101
+ test : breaking
113
102
(pushd tests && go test -v ./...)
114
103
115
104
fmt : format-python
@@ -118,7 +107,7 @@ fmt: format-python
118
107
# CI System
119
108
# ####################
120
109
121
- presubmit : proto-commit lint test
110
+ presubmit : lint test
122
111
postsubmit : presubmit
123
112
124
113
# ####################
Original file line number Diff line number Diff line change @@ -22,10 +22,6 @@ gen` will update the proto.lock file with new changes.
22
22
23
23
## Backwards Incompatible Changes
24
24
25
- If a PR tries to make backwards incompatible changes, it will be
26
- blocked by protolock. To force these changes in, install
27
- [ protolock] ( https://github.com/nilslice/protolock ) and run
28
- ` protolock commit --force ` .
29
-
30
- You must include a note in your PR that you had to force the
31
- protolock and why.
25
+ If a PR tries to make backwards incompatible changes, it will be blocked by ` buf breaking ` .
26
+ If there are legitimate reasons to make these breaking changes forever, the configuration in [ ` buf.yaml ` ] ( buf.yaml ) can be changed.
27
+ If it is a one-off case, the PR can be force approved skipping the test.
Original file line number Diff line number Diff line change @@ -2,6 +2,9 @@ version: v1
2
2
build :
3
3
excludes :
4
4
- common-protos
5
+ breaking :
6
+ use :
7
+ - WIRE_JSON
5
8
lint :
6
9
use :
7
10
- BASIC
You can’t perform that action at this time.
0 commit comments