Skip to content

Patch from Envoy: exclude emsdk targets for Bazel/gcc. Fixes #149. #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ on:
- 'envoy-release/**'
- 'istio-release/**'

schedule:
- cron: '0 0 * * *'

jobs:

format:
Expand All @@ -41,8 +44,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)
Expand All @@ -55,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
Expand Down
48 changes: 48 additions & 0 deletions bazel/emsdk.patch
Original file line number Diff line number Diff line change
@@ -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",
],
)
2 changes: 2 additions & 0 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down