From afe2a1b4ff3412d8765389276ed6f77a9a023355 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Wed, 26 Apr 2023 15:59:28 +0000 Subject: [PATCH 1/4] Patch from Envoy: exclude emsdk targets for Bazel/gcc. Fixes #149. Signed-off-by: Martijn Stevenson --- bazel/emsdk.patch | 48 ++++++++++++++++++++++++++++++++++++++++++ bazel/repositories.bzl | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 bazel/emsdk.patch diff --git a/bazel/emsdk.patch b/bazel/emsdk.patch new file mode 100644 index 0000000..21ee899 --- /dev/null +++ b/bazel/emsdk.patch @@ -0,0 +1,48 @@ +diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl +index 95801ba..95fdabd 100644 +--- a/bazel/emscripten_deps.bzl ++++ b/bazel/emscripten_deps.bzl +@@ -69,31 +69,3 @@ def emscripten_deps(emscripten_version = "latest"): + build_file = "@emsdk//emscripten_toolchain:emscripten.BUILD", + type = "zip", + ) +- +- if "emscripten_npm_linux" not in excludes: +- npm_install( +- name = "emscripten_npm_linux", +- package_json = "@emscripten_bin_linux//:emscripten/package.json", +- package_lock_json = "@emscripten_bin_linux//:emscripten/package-lock.json", +- ) +- +- if "emscripten_npm_mac" not in excludes: +- npm_install( +- name = "emscripten_npm_mac", +- package_json = "@emscripten_bin_mac//:emscripten/package.json", +- package_lock_json = "@emscripten_bin_mac//:emscripten/package-lock.json", +- ) +- +- if "emscripten_npm_mac_arm64" not in excludes: +- npm_install( +- name = "emscripten_npm_mac", +- package_json = "@emscripten_bin_mac_arm64//:emscripten/package.json", +- package_lock_json = "@emscripten_bin_mac_arm64//:emscripten/package-lock.json", +- ) +- +- if "emscripten_npm_win" not in excludes: +- npm_install( +- name = "emscripten_npm_win", +- package_json = "@emscripten_bin_win//:emscripten/package.json", +- package_lock_json = "@emscripten_bin_win//:emscripten/package-lock.json", +- ) +diff --git a/bazel/emscripten_toolchain/BUILD.bazel b/bazel/emscripten_toolchain/BUILD.bazel +index eb36959..12dba37 100644 +--- a/bazel/emscripten_toolchain/BUILD.bazel ++++ b/bazel/emscripten_toolchain/BUILD.bazel +@@ -13,7 +13,6 @@ filegroup( + "env.sh", + "env.bat", + "@emsdk//:binaries", +- "@emsdk//:node_modules", + "@nodejs//:node_files", + ], + ) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 016abc3..59ec24b 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -23,6 +23,8 @@ def proxy_wasm_cpp_sdk_repositories(): # v3.1.7 with Bazel fixes strip_prefix = "emsdk-0ea8f8a8707070e9a7c83fbb4a3065683bcf1799/bazel", url = "https://github.com/emscripten-core/emsdk/archive/0ea8f8a8707070e9a7c83fbb4a3065683bcf1799.tar.gz", + patches = ["@proxy_wasm_cpp_sdk//bazel:emsdk.patch"], + patch_args = ["-p2"], ) maybe( From e30cecdd7884c426b3222a9584bdda6f14d4c31b Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Wed, 26 Apr 2023 21:22:19 +0000 Subject: [PATCH 2/4] Bump clang-format version to work on ubuntu-latest Signed-off-by: Martijn Stevenson --- .github/workflows/cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 85e7017..583ba4c 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -41,8 +41,8 @@ jobs: - name: Format (clang-format) run: | - sudo apt-get install clang-format-9 - find . -name "*.h" -o -name "*.cc" -o -name "*.proto" | grep -v ".pb." | xargs -n1 clang-format-9 -i + sudo apt-get install clang-format-12 + find . -name "*.h" -o -name "*.cc" -o -name "*.proto" | grep -v ".pb." | xargs -n1 clang-format-12 -i git diff --exit-code - name: Format (buildifier) From 969168bc8caebf4eaeef1ad366e33a34daa2bf65 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Wed, 26 Apr 2023 21:25:50 +0000 Subject: [PATCH 3/4] Add daily CI run for proxy-wasm-cpp-sdk Signed-off-by: Martijn Stevenson --- .github/workflows/cpp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 583ba4c..29e0ebd 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -28,6 +28,9 @@ on: - 'envoy-release/**' - 'istio-release/**' + schedule: + - cron: '0 0 * * *' + jobs: format: From ba217093c211aeb4898adb1c9fec783b662230dc Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Thu, 27 Apr 2023 13:08:07 +0000 Subject: [PATCH 4/4] Ignore BUILD files in license checks Signed-off-by: Martijn Stevenson --- .github/workflows/cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 29e0ebd..e3138f3 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -58,7 +58,7 @@ jobs: run: | go install github.com/google/addlicense@latest export PATH=$PATH:$(go env GOPATH)/bin - addlicense -check . + addlicense -ignore="**/BUILD" -check . protobuf: runs-on: ubuntu-latest