Merge branch 'main' into fix_otlp_http_ssl_1402

open-telemetry · Apr 1, 2023 · 8a47cf8 · 8a47cf8
2 parents c247437 + 9bcfcb9
commit 8a47cf8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -229,7 +229,7 @@ load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps")
 
 opentelemetry_cpp_deps()
 
-# Load extra dependencies required for OpenTelemetry
+# (required after v1.8.0) Load extra dependencies required for OpenTelemetry
 load("@io_opentelemetry_cpp//bazel:extra_deps.bzl", "opentelemetry_extra_deps")
 
 opentelemetry_extra_deps()

diff --git a/ci/do_ci.ps1 b/ci/do_ci.ps1
@@ -6,6 +6,8 @@ trap { $host.SetShouldExit(1) }
 
 $action = $args[0]
 
+$nproc = (Get-ComputerInfo).CsNumberOfLogicalProcessors
+
 $SRC_DIR = (Get-Item -Path ".\").FullName
 
 $BAZEL_OPTIONS = "--copt=-DENABLE_LOGS_PREVIEW --copt=-DENABLE_ASYNC_EXPORT"
@@ -40,7 +42,7 @@ switch ($action) {
     if ($exit -ne 0) {
       exit $exit
     }
-    cmake --build .
+    cmake --build . -j $nproc
     $exit = $LASTEXITCODE
     if ($exit -ne 0) {
       exit $exit
@@ -61,7 +63,7 @@ switch ($action) {
     if ($exit -ne 0) {
       exit $exit
     }
-    cmake --build .
+    cmake --build . -j $nproc
     $exit = $LASTEXITCODE
     if ($exit -ne 0) {
       exit $exit
@@ -90,7 +92,7 @@ switch ($action) {
     if ($exit -ne 0) {
       exit $exit
     }
-    cmake --build .
+    cmake --build . -j $nproc
     $exit = $LASTEXITCODE
     if ($exit -ne 0) {
       exit $exit
@@ -111,7 +113,7 @@ switch ($action) {
     if ($exit -ne 0) {
       exit $exit
     }
-    cmake --build .
+    cmake --build . -j $nproc
     $exit = $LASTEXITCODE
     if ($exit -ne 0) {
       exit $exit
@@ -132,7 +134,7 @@ switch ($action) {
     if ($exit -ne 0) {
       exit $exit
     }
-    cmake --build .
+    cmake --build . -j $nproc
     $exit = $LASTEXITCODE
     if ($exit -ne 0) {
       exit $exit
@@ -154,7 +156,7 @@ switch ($action) {
     if ($exit -ne 0) {
       exit $exit
     }
-    cmake --build .
+    cmake --build . -j $nproc
     $exit = $LASTEXITCODE
     if ($exit -ne 0) {
       exit $exit
@@ -176,7 +178,7 @@ switch ($action) {
     if ($exit -ne 0) {
       exit $exit
     }
-    cmake --build .
+    cmake --build . -j $nproc
     $exit = $LASTEXITCODE
     if ($exit -ne 0) {
       exit $exit
@@ -197,7 +199,7 @@ switch ($action) {
     if ($exit -ne 0) {
       exit $exit
     }
-    cmake --build .
+    cmake --build . -j $nproc
     $exit = $LASTEXITCODE
     if ($exit -ne 0) {
       exit $exit
@@ -214,7 +216,7 @@ switch ($action) {
     if ($exit -ne 0) {
       exit $exit
     }
-    cmake --build .
+    cmake --build . -j $nproc
     $exit = $LASTEXITCODE
     if ($exit -ne 0) {
       exit $exit