Skip to content

Adding Mac & Windows to build #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Feb 7, 2024
Merged

Adding Mac & Windows to build #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f41e1e2
Added Windows build-and-run-tests job in build.yml file
MWSestabro Oct 31, 2023
8603ca3
Added wget install to fix Windows build issues
MWSestabro Oct 31, 2023
db6c541
Adjusted wget install to use run: | yml format
MWSestabro Oct 31, 2023
f2f35c5
Troubleshooting Windows Build file, adding Verbose to tar execution
MWSestabro Oct 31, 2023
83afd81
Adjust wget command to fix failures in OpenTelemetry Colelctor binary…
MWSestabro Oct 31, 2023
3734886
Merge https://github.com/mathworks/OpenTelemetry-Matlab into testing
MWSestabro Nov 1, 2023
55e607b
Merged with main and updated Windows build to reflect updated changes
MWSestabro Nov 1, 2023
3503701
Remove examples on Windows build job due to Matlab Compiler related e…
MWSestabro Nov 7, 2023
4e362fb
Adding Verbose flag on failing cmake command for more info
MWSestabro Nov 7, 2023
53a0c39
Checking Github-Actions cmake version
MWSestabro Nov 9, 2023
b7aa80c
Adding libMatlabDataArray Dependency in Cmake
MWSestabro Nov 9, 2023
74375f4
Update Matlab install version to 2023a, and remove previous CMake fil…
MWSestabro Dec 5, 2023
7688dac
Add missing paren
MWSestabro Dec 5, 2023
4495889
adding Macos to build.yml
MWSestabro Dec 21, 2023
ae20c90
Fix yml syntax
MWSestabro Dec 21, 2023
bfd60a6
Updated Mac Build to 23a & turn off examples
MWSestabro Jan 31, 2024
015c220
Merge branch 'testing' of https://github.com/mathworks/OpenTelemetry-…
MWSestabro Jan 31, 2024
d0c0a06
Updating build file to remove R2023a test requirement for Windows & M…
MWSestabro Feb 6, 2024
3495e90
Adding examples to build on Windows & Mac
MWSestabro Feb 6, 2024
f189ce7
Updating Matlab Actions to v2
MWSestabro Feb 6, 2024
9f0344f
Adding MATLAB_Compiler to matlab install
MWSestabro Feb 6, 2024
ecd824a
Updating context_propagation cmake to resolve build error
MWSestabro Feb 6, 2024
7869efb
Removing examples build from windows
MWSestabro Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 57 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
push:
jobs:
build-and-run-tests:
build-and-run-tests-ubuntu:
runs-on: ubuntu-latest
env:
OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
Expand All @@ -14,7 +14,9 @@ jobs:
with:
path: opentelemetry-matlab
- name: Install MATLAB
uses: matlab-actions/setup-matlab@v1
uses: matlab-actions/setup-matlab@v2
with:
products: MATLAB_Compiler
- name: Build OpenTelemetry-Matlab
run: |
cd opentelemetry-matlab
Expand All @@ -30,6 +32,58 @@ jobs:
# Add the installation directory to the MATLAB Search Path by
# setting the MATLABPATH environment variable.
MATLABPATH: ${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
uses: matlab-actions/run-tests@v1
uses: matlab-actions/run-tests@v2
with:
select-by-folder: opentelemetry-matlab/test
build-and-run-tests-windows:
runs-on: windows-latest
env:
OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
steps:
- name: Download OpenTelemetry-Matlab source
uses: actions/checkout@v3
with:
path: opentelemetry-matlab
- name: Install MATLAB
uses: matlab-actions/setup-matlab@v2
with:
products: MATLAB_Compiler
- name: Build OpenTelemetry-Matlab
run: |
cd opentelemetry-matlab
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
cmake --build build --config Release --target install
- name: Run tests
env:
# Add the installation directory to the MATLAB Search Path by
# setting the MATLABPATH environment variable.
MATLABPATH: ${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
uses: matlab-actions/run-tests@v2
with:
select-by-folder: opentelemetry-matlab/test
build-and-run-tests-macos:
runs-on: macos-latest
env:
OPENTELEMETRY_MATLAB_INSTALL: "${{ github.workspace }}/otel_matlab_install"
steps:
- name: Download OpenTelemetry-Matlab source
uses: actions/checkout@v3
with:
path: opentelemetry-matlab
- name: Install MATLAB
uses: matlab-actions/setup-matlab@v2
with:
products: MATLAB_Compiler
- name: Build OpenTelemetry-Matlab
run: |
cd opentelemetry-matlab
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
cmake --build build --config Release --target install
- name: Run tests
env:
# Add the installation directory to the MATLAB Search Path by
# setting the MATLABPATH environment variable.
MATLABPATH: ${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
uses: matlab-actions/run-tests@v2
with:
select-by-folder: opentelemetry-matlab/test
2 changes: 1 addition & 1 deletion examples/context_propagation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set(CONTEXTPROP_EXAMPLE_DEPLOYNAME mymagic)
set(CONTEXTPROP_EXAMPLE_MATLAB_SOURCE ${CMAKE_CURRENT_LIST_DIR}/matlab/${CONTEXTPROP_EXAMPLE_DEPLOYNAME}.m)
set(CONTEXTPROP_EXAMPLE_ROUTES ../../../examples/context_propagation/matlab/routes.json) #somehow, only relative paths are allowed
matlab_get_version_from_matlab_run(${Matlab_MAIN_PROGRAM} Matlab_LIST_VERSION)
if(DEFINED Matlab_LIST_VERSION AND ${Matlab_LIST_VERSION} VERSION_GREATER_EQUAL 23.2.0)
if(Matlab_LIST_VERSION VERSION_GREATER_EQUAL 23.2.0)
# since MATLAB R2023b, route mapping can be specified at the archive level
set(ARCHIVE_ROUTES ",ROUTES:${CONTEXTPROP_EXAMPLE_ROUTES}")
else()
Expand Down