Skip to content

Commit 81c472c

Browse files
martijnekenmartijneken
committed
Cleanup
- add license headers to generated files - update Bazel builds for examples - remove unnecessary protobuf binary CI check Signed-off-by: Martijn Stevenson <mstevenson@google.com>
1 parent ed827a4 commit 81c472c

File tree

8 files changed

+106
-29
lines changed

8 files changed

+106
-29
lines changed

‎.github/workflows/cpp.yml‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -60,29 +60,6 @@ jobs:
6060
export PATH=$PATH:$(go env GOPATH)/bin
6161
addlicense -ignore="**/BUILD" -check .
6262
63-
protobuf:
64-
runs-on: ubuntu-22.04
65-
66-
steps:
67-
- uses: actions/checkout@v2
68-
69-
- name: Install protobuf v3.9.1
70-
run: |
71-
git clone https://github.com/protocolbuffers/protobuf
72-
cd protobuf
73-
git checkout v3.9.1
74-
./autogen.sh
75-
./configure
76-
make
77-
sudo make install
78-
sudo ldconfig
79-
80-
- name: Re-generate and verify protobuf artifacts
81-
run: |
82-
rm *.pb.{cc,h}
83-
make protobuf
84-
git diff --exit-code -G "(^[^ /])|(^\s+[^\*])" *.pb.{cc,h}
85-
8663
build:
8764
runs-on: ubuntu-22.04
8865

‎example/BUILD‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,31 @@ proxy_wasm_cc_binary(
66
name = "http_wasm_example.wasm",
77
srcs = ["http_wasm_example.cc"],
88
copts = ["-std=c++17"],
9+
)
10+
11+
proxy_wasm_cc_binary(
12+
name = "http_re_example.wasm",
13+
srcs = ["http_re_example.cc"],
14+
copts = ["-std=c++17"],
915
deps = ["@com_google_re2//:re2"],
1016
)
1117

1218
proxy_wasm_cc_binary(
13-
name = "http_wasm_example_with_protobuf_lite.wasm",
14-
srcs = ["http_wasm_example.cc"],
19+
name = "http_proto_example_none.wasm",
20+
srcs = ["http_proto_example.cc"],
21+
copts = ["-std=c++17"],
22+
)
23+
24+
proxy_wasm_cc_binary(
25+
name = "http_proto_example_lite.wasm",
26+
srcs = ["http_proto_example.cc"],
1527
copts = ["-std=c++17"],
1628
protobuf = "lite",
17-
deps = ["@com_google_re2//:re2"],
1829
)
1930

2031
proxy_wasm_cc_binary(
21-
name = "http_wasm_example_with_protobuf_full.wasm",
22-
srcs = ["http_wasm_example.cc"],
32+
name = "http_proto_example_full.wasm",
33+
srcs = ["http_proto_example.cc"],
2334
copts = ["-std=c++17"],
2435
protobuf = "full",
25-
deps = ["@com_google_re2//:re2"],
2636
)

‎proxy_wasm_intrinsics.pb.cc‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
// Copyright 2016-2019 Envoy Project Authors
2+
// Copyright 2020 Google LLC
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
116
// Generated by the protocol buffer compiler. DO NOT EDIT!
217
// source: proxy_wasm_intrinsics.proto
318
// Protobuf C++ Version: 5.26.1

‎proxy_wasm_intrinsics.pb.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
// Copyright 2016-2019 Envoy Project Authors
2+
// Copyright 2020 Google LLC
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
116
// Generated by the protocol buffer compiler. DO NOT EDIT!
217
// source: proxy_wasm_intrinsics.proto
318
// Protobuf C++ Version: 5.26.1

‎proxy_wasm_intrinsics_lite.pb.cc‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
// Copyright 2016-2019 Envoy Project Authors
2+
// Copyright 2020 Google LLC
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
116
// Generated by the protocol buffer compiler. DO NOT EDIT!
217
// source: proxy_wasm_intrinsics_lite.proto
318
// Protobuf C++ Version: 5.26.1

‎proxy_wasm_intrinsics_lite.pb.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
// Copyright 2016-2019 Envoy Project Authors
2+
// Copyright 2020 Google LLC
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
116
// Generated by the protocol buffer compiler. DO NOT EDIT!
217
// source: proxy_wasm_intrinsics_lite.proto
318
// Protobuf C++ Version: 5.26.1

‎struct_lite.pb.cc‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
// Copyright 2016-2019 Envoy Project Authors
2+
// Copyright 2020 Google LLC
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
116
// Generated by the protocol buffer compiler. DO NOT EDIT!
217
// source: struct_lite.proto
318
// Protobuf C++ Version: 5.26.1

‎struct_lite.pb.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
// Copyright 2016-2019 Envoy Project Authors
2+
// Copyright 2020 Google LLC
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
116
// Generated by the protocol buffer compiler. DO NOT EDIT!
217
// source: struct_lite.proto
318
// Protobuf C++ Version: 5.26.1

0 commit comments

Comments
 (0)