Skip to content

Commit 13e3ff2

Browse files
committed
Enable Ninja build on Linux and Mac
1 parent d60e327 commit 13e3ff2

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,14 @@ jobs:
4343
uses: actions/checkout@v3
4444
with:
4545
path: opentelemetry-matlab
46-
- name: Install ninja-build
47-
run: choco install ninja
4846
- name: Install MATLAB
4947
uses: matlab-actions/setup-matlab@v2
5048
with:
5149
products: MATLAB_Compiler
5250
- name: Build OpenTelemetry-Matlab
5351
working-directory: opentelemetry-matlab
5452
run: |
55-
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
53+
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
5654
cmake --build build --config Release --target install
5755
- name: Run tests
5856
env:

.github/workflows/publish_mltbx.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,14 @@ jobs:
4343
uses: actions/checkout@v3
4444
with:
4545
path: opentelemetry-matlab
46-
- name: Install ninja-build
47-
run: choco install ninja
4846
- name: Install MATLAB
4947
uses: matlab-actions/setup-matlab@v2
5048
with:
5149
products: MATLAB_Compiler
5250
- name: Build OpenTelemetry-Matlab
5351
working-directory: opentelemetry-matlab
5452
run: |
55-
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
53+
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
5654
cmake --build build --config Release --target install
5755
- name: Compress into single artifact
5856
working-directory: ${{ github.workspace }}

0 commit comments

Comments
 (0)