From d4b41a4b311ee7e3daa131f6b09de9fdabdc4640 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Mon, 30 May 2022 09:25:46 +0200 Subject: [PATCH 1/2] Move to current protobuf release to remedy CI breakage Signed-off-by: Pierre R. Mai --- .github/workflows/protobuf.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index 493ee5a74..4a840a489 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -32,20 +32,20 @@ jobs: id: cache-depends uses: actions/cache@v2 with: - path: protobuf-3.15.8 + path: protobuf-3.20.1 key: ${{ runner.os }}-v1-depends - name: Download ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' - run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz && tar xzvf protobuf-all-3.15.8.tar.gz + run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protobuf-all-3.20.1.tar.gz && tar xzvf protobuf-all-3.20.1.tar.gz - name: Build ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' - working-directory: protobuf-3.15.8 + working-directory: protobuf-3.20.1 run: ./configure DIST_LANG=cpp --prefix=/usr && make - name: Install ProtoBuf - working-directory: protobuf-3.15.8 + working-directory: protobuf-3.20.1 run: sudo make install && sudo ldconfig - name: Install proto2cpp @@ -62,7 +62,7 @@ jobs: - name: Prepare Documentation Build run: | sed -i 's/PROJECT_NUMBER\s*= @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@/PROJECT_NUMBER = master (${{ steps.get_version.outputs.VERSION }})/g' doxygen_config.cmake.in - echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.15.8/* */proto2cpp/*" >> doxygen_config.cmake.in + echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.20.1/* */proto2cpp/*" >> doxygen_config.cmake.in echo "GENERATE_TREEVIEW = YES" >> doxygen_config.cmake.in - name: Configure C++ Build @@ -120,20 +120,20 @@ jobs: id: cache-depends uses: actions/cache@v2 with: - path: protobuf-3.15.8 + path: protobuf-3.20.1 key: ${{ runner.os }}-v1-depends - name: Download ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' - run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz && tar xzvf protobuf-all-3.15.8.tar.gz + run: curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protobuf-all-3.20.1.tar.gz && tar xzvf protobuf-all-3.20.1.tar.gz - name: Build ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' - working-directory: protobuf-3.15.8 + working-directory: protobuf-3.20.1 run: ./configure DIST_LANG=cpp --prefix=/usr && make - name: Install ProtoBuf - working-directory: protobuf-3.15.8 + working-directory: protobuf-3.20.1 run: sudo make install && sudo ldconfig - name: Prepare C++ Build From 5ddf90ca77c9fc2e37149a4cd4e75b916f8cb913 Mon Sep 17 00:00:00 2001 From: Stefan Cyliax Date: Mon, 30 May 2022 11:13:23 +0200 Subject: [PATCH 2/2] exclude of flatbuffers submodule to not have examples in reference doc Signed-off-by: Stefan Cyliax --- .github/workflows/protobuf.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index 4a840a489..a7acae918 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -62,7 +62,7 @@ jobs: - name: Prepare Documentation Build run: | sed -i 's/PROJECT_NUMBER\s*= @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@/PROJECT_NUMBER = master (${{ steps.get_version.outputs.VERSION }})/g' doxygen_config.cmake.in - echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.20.1/* */proto2cpp/*" >> doxygen_config.cmake.in + echo "EXCLUDE_PATTERNS = */osi3/* */protobuf-3.20.1/* */proto2cpp/* */flatbuffers/*" >> doxygen_config.cmake.in echo "GENERATE_TREEVIEW = YES" >> doxygen_config.cmake.in - name: Configure C++ Build @@ -74,7 +74,7 @@ jobs: run: cmake --build . --config Release -j 4 - name: Build Python - run: python setup.py build && python setup.py sdist + run: python setup.py build && python setup.py sdist - name: Install Python run: python -m pip install . @@ -153,7 +153,7 @@ jobs: run: cmake --build . --config Release -j 4 - name: Build Python - run: python setup.py build && python setup.py sdist + run: python setup.py build && python setup.py sdist - name: Install Python run: python -m pip install .