Skip to content

Commit b7b0431

Browse files
duncanpoduncanpo
committed
refactors release creation workflow, fixes #142, fixes #129 
1 parent d56311f commit b7b0431

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

‎.github/workflows/build_and_test_full.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ env:
1010
jobs:
1111
get_version:
1212
runs-on: ubuntu-20.04
13+
outputs:
14+
version: ${{ steps.getversion.outputs.latest_tag }}
1315
steps:
1416
# need fetch-depth:0 to also download the tags
1517
- name: Download OpenTelemetry-Matlab source
@@ -44,7 +46,7 @@ jobs:
4446
- name: Build OpenTelemetry-Matlab
4547
working-directory: opentelemetry-matlab
4648
run: |
47-
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DWITH_OTLP_GRPC=ON -DUSE_BATCH_FOR_MCC=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.getversion.outputs.latest_tag }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
49+
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DWITH_OTLP_GRPC=ON -DUSE_BATCH_FOR_MCC=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.outputs.version }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
4850
cmake --build build --config Release --target install
4951
- name: Run tests
5052
env:
@@ -75,7 +77,7 @@ jobs:
7577
shell: cmd
7678
run: |
7779
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
78-
cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DWITH_OTLP_GRPC=ON -DUSE_BATCH_FOR_MCC=ON -DFETCH_VCPKG=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.getversion.outputs.latest_tag }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
80+
cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DWITH_OTLP_GRPC=ON -DUSE_BATCH_FOR_MCC=ON -DFETCH_VCPKG=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.outputs.version }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
7981
cmake --build build --config Release --target install
8082
- name: Run tests
8183
env:
@@ -107,7 +109,7 @@ jobs:
107109
- name: Build OpenTelemetry-Matlab
108110
working-directory: opentelemetry-matlab
109111
run: |
110-
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DWITH_OTLP_GRPC=ON -DUSE_BATCH_FOR_MCC=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.getversion.outputs.latest_tag }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
112+
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DWITH_OTLP_GRPC=ON -DUSE_BATCH_FOR_MCC=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.outputs.version }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
111113
cmake --build build --config Release --target install
112114
- name: Run tests
113115
env:

‎.github/workflows/build_and_test_simple.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,15 @@ env:
1111
jobs:
1212
get_version:
1313
runs-on: ubuntu-20.04
14+
outputs:
15+
version: ${{ steps.getversion.outputs.latest_tag }}
1416
steps:
1517
# need fetch-depth:0 to also download the tags
1618
- name: Download OpenTelemetry-Matlab source
1719
uses: actions/checkout@v3
1820
with:
1921
path: opentelemetry-matlab
2022
fetch-depth: 0
21-
- name: Debug
22-
shell: bash
23-
working-directory: opentelemetry-matlab
24-
run: echo "$(git describe --tags --abbrev=0)"
2523
- name: Get Version
2624
id: getversion
2725
shell: bash
@@ -49,7 +47,7 @@ jobs:
4947
- name: Build OpenTelemetry-Matlab
5048
working-directory: opentelemetry-matlab
5149
run: |
52-
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DUSE_BATCH_FOR_MCC=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.getversion.outputs.latest_tag }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
50+
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DUSE_BATCH_FOR_MCC=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.outputs.version }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
5351
cmake --build build --config Release --target install
5452
- name: Run tests
5553
env:
@@ -80,7 +78,7 @@ jobs:
8078
shell: cmd
8179
run: |
8280
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
83-
cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DUSE_BATCH_FOR_MCC=ON -DFETCH_VCPKG=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.getversion.outputs.latest_tag }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
81+
cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DUSE_BATCH_FOR_MCC=ON -DFETCH_VCPKG=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.outputs.version }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
8482
cmake --build build --config Release --target install
8583
- name: Run tests
8684
env:
@@ -112,7 +110,7 @@ jobs:
112110
- name: Build OpenTelemetry-Matlab
113111
working-directory: opentelemetry-matlab
114112
run: |
115-
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DUSE_BATCH_FOR_MCC=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.getversion.outputs.latest_tag }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
113+
cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DUSE_BATCH_FOR_MCC=ON -DOTEL_MATLAB_VERSION=${{ needs.get_version.outputs.version }} -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
116114
cmake --build build --config Release --target install
117115
- name: Run tests
118116
env:

0 commit comments

Comments
 (0)