Skip to content

Commit d737dbe

Browse files
committed
enable Ninja on Windows
1 parent 2a1af0f commit d737dbe

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

.github/workflows/build_and_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ jobs:
4949
uses: matlab-actions/setup-matlab@v2
5050
with:
5151
products: MATLAB_Compiler
52-
- name: Enable Developer Command Prompt for Visual Studio
53-
uses: ilammy/msvc-dev-cmd@v1.13.0
5452
- name: Build OpenTelemetry-Matlab
5553
working-directory: opentelemetry-matlab
54+
shell: cmd
5655
run: |
56+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
5757
cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
5858
cmake --build build --config Release --target install
5959
- name: Run tests

.github/workflows/publish_mltbx.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ jobs:
5151
products: MATLAB_Compiler
5252
- name: Build OpenTelemetry-Matlab
5353
working-directory: opentelemetry-matlab
54+
shell: cmd
5455
run: |
56+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
5557
cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
5658
cmake --build build --config Release --target install
5759
- name: Compress into single artifact

vcpkg.json

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,23 @@
77
"nlohmann-json"
88
],
99
"features": {
10-
"otlp-http": {"description": "Otlp HTTP Exporter", "dependencies": ["curl"]},
11-
"otlp-grpc": {"description": "Otlp gRPC Exporter", "dependencies": ["grpc", "abseil", "c-ares", "re2", "openssl", "upb"]}
12-
}
10+
"otlp-http": {
11+
"description": "Otlp HTTP Exporter",
12+
"dependencies": [
13+
"curl"
14+
]
15+
},
16+
"otlp-grpc": {
17+
"description": "Otlp gRPC Exporter",
18+
"dependencies": [
19+
"grpc",
20+
"abseil",
21+
"c-ares",
22+
"re2",
23+
"openssl",
24+
"upb"
25+
]
26+
}
27+
},
28+
"builtin-baseline": "638b1588be3a265a9c7ad5b212cef72a1cad336a"
1329
}

0 commit comments

Comments
 (0)