diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 23a1561..1c47b7f 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -58,6 +58,9 @@ jobs: rm -rd * cmake .. -DCMAKE_BUILD_TYPE=Release -DREGENERATE_CPP_SOURCES=ON cmake --build . + cd .. + git add --intent-to-add --all -- src + git diff --exit-code -- src - name: Test Zserio C++ tutorial (sources regeneration) run: | @@ -97,6 +100,9 @@ jobs: rm -rd * cmake ../pmr -DCMAKE_BUILD_TYPE=Release -DREGENERATE_CPP_SOURCES=ON cmake --build . + cd .. + git add --intent-to-add --all -- pmr/src + git diff --exit-code -- pmr/src - name: Test Zserio C++ custom memory management tutorial (sources regeneration) run: | @@ -110,3 +116,11 @@ jobs: with: name: zserio-tutorial-cpp-${{matrix.os}} path: build/ZserioTutorialCpp + + keepalive: + if: github.event_name == 'schedule' + runs-on: ubuntu-latest + permissions: + actions: write + steps: + - uses: liskin/gh-workflow-keepalive@v1 diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 01c5a77..e508a91 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -60,6 +60,9 @@ jobs: rm -rd * cmake .. -DREGENERATE_CPP_SOURCES=ON cmake --build . --config Release + cd .. + git add --intent-to-add --all -- src + git diff --exit-code -- src shell: bash - name: Test Zserio C++ tutorial (sources regeneration) @@ -105,6 +108,9 @@ jobs: rm -rd * cmake ../pmr -DREGENERATE_CPP_SOURCES=ON cmake --build . --config Release + cd .. + git add --intent-to-add --all -- pmr/src + git diff --exit-code -- pmr/src shell: bash - name: Test Zserio C++ custom memory management tutorial (sources regeneration) @@ -120,3 +126,11 @@ jobs: with: name: zserio-tutorial-cpp-${{matrix.os}} path: build/Release/ZserioTutorialCpp.exe + + keepalive: + if: github.event_name == 'schedule' + runs-on: ubuntu-latest + permissions: + actions: write + steps: + - uses: liskin/gh-workflow-keepalive@v1 diff --git a/.github/workflows/keep_alive.yml b/.github/workflows/keep_alive.yml deleted file mode 100644 index db68bd1..0000000 --- a/.github/workflows/keep_alive.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: KeepAlive - -on: - schedule: - - cron: "0 0 * * 1" - -jobs: - workflow-keepalive: - if: github.event_name == 'schedule' - runs-on: ubuntu-latest - permissions: - actions: write - steps: - - uses: liskin/gh-workflow-keepalive@v1 diff --git a/CMakeLists.txt b/CMakeLists.txt index cd99b60..002c944 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ if (REGENERATE_CPP_SOURCES) MESSAGE(STATUS "Compiling zserio tutorial schema") execute_process(COMMAND ${Java_JAVA_EXECUTABLE} -jar "${ZSERIO_JAR}" - -cpp ${TUTORIAL_ZSERIO_GEN_DIR} -src ${CMAKE_CURRENT_SOURCE_DIR} tutorial.zs + -cpp ${TUTORIAL_ZSERIO_GEN_DIR} -src ${CMAKE_CURRENT_SOURCE_DIR} tutorial.zs -ignoreTimestamps OUTPUT_VARIABLE ZSERIO_OUTPUT RESULT_VARIABLE ZSERIO_RESULT_CODE) if (ZSERIO_RESULT_CODE) diff --git a/pmr/CMakeLists.txt b/pmr/CMakeLists.txt index 5f3c445..b63ac96 100644 --- a/pmr/CMakeLists.txt +++ b/pmr/CMakeLists.txt @@ -15,7 +15,7 @@ if (REGENERATE_CPP_SOURCES) MESSAGE(STATUS "Compiling zserio tutorial schema") execute_process(COMMAND ${Java_JAVA_EXECUTABLE} -jar "${ZSERIO_JAR}" - -cpp ${TUTORIAL_ZSERIO_GEN_DIR} -src ${CMAKE_CURRENT_SOURCE_DIR}/.. tutorial.zs + -cpp ${TUTORIAL_ZSERIO_GEN_DIR} -src ${CMAKE_CURRENT_SOURCE_DIR}/.. tutorial.zs -ignoreTimestamps -setCppAllocator polymorphic OUTPUT_VARIABLE ZSERIO_OUTPUT RESULT_VARIABLE ZSERIO_RESULT_CODE)