Replaced local_resources with local_ram_resources and local_cpu_resou…

…rces (#59) * Replaced local_resources with local_ram_resources and local_cpu_resources * Fix the patch command for emsdk Backport of envoyproxy/envoy#14673 Co-authored-by: Jonh Wendell <jonh.wendell@redhat.com>
maistra · Jan 19, 2021 · a1c622a · a1c622a
1 parent 51fe386
commit a1c622a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -901,7 +901,7 @@ DEPENDENCY_REPOSITORIES_SPEC = dict(
         version = "1.39",
         sha256 = "4ac0f1f3de8b3f1373d435cd7e58bd94de4146e751f099732167749a229b443b",
         patch_cmds = [
-            "[[ \"$(uname -m)\" == \"x86_64\" ]] && ./emsdk install 1.39.6-upstream && ./emsdk activate --embedded 1.39.6-upstream || true",
+            "if [[ \"$(uname -m)\" == \"x86_64\" ]]; then ./emsdk install 1.39.6-upstream && ./emsdk activate --embedded 1.39.6-upstream; fi",
         ],
         strip_prefix = "emsdk-{version}.6",
         urls = ["https://github.com/emscripten-core/emsdk/archive/{version}.6.tar.gz"],

diff --git a/maistra/run-ci.sh b/maistra/run-ci.sh
@@ -16,7 +16,8 @@ export BUILD_SCM_STATUS="SHA=${PULL_PULL_SHA:-undefined}"
 
 # Build
 time bazel build \
-  --local_resources 12288,4.0,1.0 \
+  --local_ram_resources=12288 \
+  --local_cpu_resources=4 \
   --jobs=4 \
   --disk_cache=/bazel-cache \
   //source/exe:envoy-static
@@ -26,7 +27,8 @@ bazel-bin/source/exe/envoy-static --version
 
 # Run tests
 time bazel test \
-  --local_resources 12288,4.0,1.0 \
+  --local_ram_resources=12288 \
+  --local_cpu_resources=4 \
   --jobs=4 \
   --build_tests_only \
   --test_env=ENVOY_IP_TEST_VERSIONS=v4only \