Skip to content

Commit 78f394d

Browse files
committed
ninja build
1 parent aaa2949 commit 78f394d

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
products: MATLAB_Compiler
5050
- name: Build OpenTelemetry-Matlab
5151
working-directory: opentelemetry-matlab
52+
shell: cmd
5253
run: |
5354
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
5455
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}

.github/workflows/publish_mltbx.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@ jobs:
1515
uses: actions/checkout@v3
1616
with:
1717
path: opentelemetry-matlab
18+
- name: Install ninja-build
19+
run: sudo apt-get install ninja-build
1820
- name: Install MATLAB
1921
uses: matlab-actions/setup-matlab@v2
2022
with:
2123
products: MATLAB_Compiler
2224
- name: Build OpenTelemetry-Matlab
25+
working-directory: opentelemetry-matlab
2326
run: |
24-
cd opentelemetry-matlab
25-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
27+
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
2628
cmake --build build --config Release --target install
2729
- name: Compress into single artifact
2830
working-directory: ${{ github.workspace }}
@@ -46,9 +48,11 @@ jobs:
4648
with:
4749
products: MATLAB_Compiler
4850
- name: Build OpenTelemetry-Matlab
51+
working-directory: opentelemetry-matlab
52+
shell: cmd
4953
run: |
50-
cd opentelemetry-matlab
51-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
54+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
55+
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
5256
cmake --build build --config Release --target install
5357
- name: Compress into single artifact
5458
working-directory: ${{ github.workspace }}
@@ -67,14 +71,16 @@ jobs:
6771
uses: actions/checkout@v3
6872
with:
6973
path: opentelemetry-matlab
74+
- name: Install ninja-build
75+
run: brew install ninja
7076
- name: Install MATLAB
7177
uses: matlab-actions/setup-matlab@v2
7278
with:
7379
products: MATLAB_Compiler
7480
- name: Build OpenTelemetry-Matlab
81+
working-directory: opentelemetry-matlab
7582
run: |
76-
cd opentelemetry-matlab
77-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
83+
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
7884
cmake --build build --config Release --target install
7985
- name: Compress into single artifact
8086
working-directory: ${{ github.workspace }}

0 commit comments

Comments
 (0)