From b39977470ad6e2547aa84f1d8f5f4a6eae55d359 Mon Sep 17 00:00:00 2001 From: Goetz Goerisch Date: Sat, 9 Nov 2024 08:19:11 +0100 Subject: [PATCH] fix(ci): align workflows --- .github/workflows/ClangRelWithDebInfoAsan.yml | 6 +++--- .github/workflows/GccDebugMemcheck.yml | 8 ++++---- .github/workflows/GccIntegrationTest.yml | 5 +++-- .github/workflows/{windows.yml => build_windows.yml} | 3 ++- 4 files changed, 12 insertions(+), 10 deletions(-) rename .github/workflows/{windows.yml => build_windows.yml} (96%) diff --git a/.github/workflows/ClangRelWithDebInfoAsan.yml b/.github/workflows/ClangRelWithDebInfoAsan.yml index 812f698..4ac9171 100644 --- 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 " - 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 index 59e0749..ba92802 100644 --- 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 " - 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 index 5053030..ede430c 100644 --- 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 b/.github/workflows/build_windows.yml similarity index 96% rename from .github/workflows/windows.yml rename to .github/workflows/build_windows.yml index 6539c5c..48caf6d 100644 --- a/.github/workflows/windows.yml +++ b/.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 \