fix(ci): align workflows

open62541 · Nov 9, 2024 · b399774 · b399774
1 parent b297556
commit b399774
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/ClangRelWithDebInfoAsan.yml b/.github/workflows/ClangRelWithDebInfoAsan.yml
@@ -1,5 +1,5 @@
 ---
-name: Clang RelWithDebInfoAsan
+name: Build & Test (clang)
 
 on:
   push:
@@ -63,7 +63,7 @@ jobs:
         # Github Actions machines are (as of this writing) 3.28
         run: |
           cmake "$GITHUB_WORKSPACE" \
-                -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+                -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
                 -DENABLE_TESTING=ON \
                 -DBUILD_SHARED_LIBS=ON \
                 -DENABLE_ASAN=ON ..
@@ -73,7 +73,7 @@ jobs:
         working-directory: ${{ runner.temp }}/build
         # Execute the build.  You can specify a specific target
         # with "--target <NAME>"
-        run: cmake --build . --config "$BUILD_TYPE"
+        run: sudo cmake --build . --config "$BUILD_TYPE"
 
       - name: Test
         shell: bash

diff --git a/.github/workflows/GccDebugMemcheck.yml b/.github/workflows/GccDebugMemcheck.yml
@@ -1,5 +1,5 @@
 ---
-name: GccDebugMemcheck
+name: Build Debug & Memcheck
 
 on:
   push:
@@ -62,7 +62,7 @@ jobs:
         shell: bash
         working-directory: ./openRoot/build
         run: |
-          cmake -DCMAKE_BUILD_TYPE=Debug \
+          cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
                 -DUA_NAMESPACE_ZERO=FULL \
                 -DBUILD_SHARED_LIBS=ON \
                 -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
@@ -96,7 +96,7 @@ jobs:
         # Github Actions machines are (as of this writing) 3.28
         run: |
           cmake "$GITHUB_WORKSPACE" \
-                -DCMAKE_BUILD_TYPE=Debug \
+                -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
                 -DENABLE_CONAN=OFF \
                 -DENABLE_TESTING=ON \
                 -DBUILD_SHARED_LIBS=ON \
@@ -109,7 +109,7 @@ jobs:
         working-directory: ${{ runner.temp }}/build
         # Execute the build.  You can specify a specific target
         # with "--target <NAME>"
-        run: cmake --build . --config "$BUILD_TYPE"
+        run: sudo cmake --build . --config "$BUILD_TYPE"
 
 
       - name: Test

diff --git a/.github/workflows/GccIntegrationTest.yml b/.github/workflows/GccIntegrationTest.yml
@@ -51,13 +51,14 @@ jobs:
           path: ./openRoot
 
       - name: Create Build Environment for open62541
+        shell: bash
         run: cmake -E make_directory ./openRoot/build
 
       - name: Configure open
         shell: bash
         working-directory: ./openRoot/build
         run: |
-          cmake -DCMAKE_BUILD_TYPE=Debug \
+          cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
                 -DUA_NAMESPACE_ZERO=FULL \
                 -DBUILD_SHARED_LIBS=ON \
                 -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
@@ -91,7 +92,7 @@ jobs:
         # Github Actions machines are (as of this writing) 3.28
         run: |
           cmake "$GITHUB_WORKSPACE" \
-                -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+                -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
                 -DENABLE_CONAN=OFF \
                 -DENABLE_TESTING=ON \
                 -DBUILD_SHARED_LIBS=ON \

diff --git a/.github/workflows/windows.yml → .github/workflows/build_windows.yml b/.github/workflows/windows.yml → .github/workflows/build_windows.yml
@@ -1,5 +1,5 @@
 ---
-name: WindowsBuildOnly
+name: Windows Build Only
 
 on:
   push:
@@ -34,6 +34,7 @@ jobs:
 
       - uses: ilammy/msvc-dev-cmd@v1
       - name: Build nodesetLoader
+        shell: bash
         run: |
           cd ./nodesetLoader && \
           cmake \