From 3b4a84d3f034238908f89b3edd7015845d290e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Angelovi=C4=8D?= Date: Sat, 3 May 2025 20:09:56 +0200 Subject: [PATCH 1/4] chore: update github ci script versions --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70be1015..286b974c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: compiler: gcc build: shared-libsystemd steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: install-libsystemd-toolchain if: matrix.build == 'embedded-static-libsystemd' run: | @@ -92,7 +92,7 @@ jobs: cpack -G DEB - name: 'Upload Artifact' if: matrix.build == 'shared-libsystemd' && matrix.os == 'ubuntu-22.04' && matrix.compiler == 'g++' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "debian-packages-${{ matrix.os }}-${{ matrix.compiler }}" path: | @@ -103,7 +103,7 @@ jobs: name: build (freebsd, clang/libc++, basu) runs-on: ubuntu-22.04 # until https://github.com/actions/runner/issues/385 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Test in FreeBSD VM uses: vmactions/freebsd-vm@v1 with: From 6b8e676fafed3ddbb160a515d6c660886936fd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Angelovi=C4=8D?= Date: Sat, 3 May 2025 20:28:35 +0200 Subject: [PATCH 2/4] chore(ci): remove obsolete ubuntu-20.04 image --- .github/workflows/ci.yml | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 286b974c..60875a36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,10 +17,6 @@ jobs: os: [ubuntu-22.04] compiler: [g++, clang] build: [shared-libsystemd, embedded-static-libsystemd] - include: - - os: ubuntu-20.04 - compiler: gcc - build: shared-libsystemd steps: - uses: actions/checkout@v4 - name: install-libsystemd-toolchain @@ -45,31 +41,14 @@ jobs: echo "SDBUSCPP_EXTRA_CXX_FLAGS=-stdlib=libc++" >> $GITHUB_ENV # We don't install googletest but we let it be built within sdbus-c++ builds below, since it needs to be built against libc++ for Clang jobs to pass # - name: install-googletest -# if: matrix.os == 'ubuntu-22.04' # run: | # sudo apt-get install -y libgmock-dev -# - name: install-googletest -# if: matrix.os == 'ubuntu-20.04' # On older ubuntus the libgmock-dev package is either unavailable or has faulty pkg-config file, so we build & install manually -# run: | -# git clone https://github.com/google/googletest.git -# cd googletest -# mkdir build -# cd build -# cmake .. -DCMAKE_CXX_FLAGS="$SDBUSCPP_EXTRA_CXX_FLAGS" -# cmake --build . -j4 -# sudo cmake --build . --target install - name: configure-debug if: matrix.build == 'shared-libsystemd' && matrix.os == 'ubuntu-22.04' run: | mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_CXX_FLAGS="-O0 -g -W -Wextra -Wall -Wnon-virtual-dtor -Werror $SDBUSCPP_EXTRA_CXX_FLAGS" -DCMAKE_VERBOSE_MAKEFILE=ON -DSDBUSCPP_INSTALL=ON -DSDBUSCPP_BUILD_TESTS=ON -DSDBUSCPP_BUILD_PERF_TESTS=ON -DSDBUSCPP_BUILD_STRESS_TESTS=ON -DSDBUSCPP_BUILD_CODEGEN=ON -DSDBUSCPP_GOOGLETEST_VERSION=1.14.0 .. - - name: configure-debug-no-tests - if: matrix.os == 'ubuntu-20.04' - run: | - mkdir build - cd build - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_CXX_FLAGS="-O0 -g -W -Wextra -Wall -Wnon-virtual-dtor -Werror $SDBUSCPP_EXTRA_CXX_FLAGS" -DCMAKE_VERBOSE_MAKEFILE=ON -DSDBUSCPP_INSTALL=ON -DSDBUSCPP_BUILD_TESTS=OFF -DSDBUSCPP_BUILD_PERF_TESTS=ON -DSDBUSCPP_BUILD_STRESS_TESTS=ON -DSDBUSCPP_BUILD_CODEGEN=ON .. - name: configure-release-with-embedded-libsystemd if: matrix.build == 'embedded-static-libsystemd' run: | @@ -86,7 +65,7 @@ jobs: sudo cmake --build . --target install ctest --output-on-failure - name: pack - if: matrix.build == 'shared-libsystemd' && matrix.os == 'ubuntu-20.04' + if: matrix.build == 'shared-libsystemd' && matrix.os == 'ubuntu-22.04' run: | cd build cpack -G DEB From a911566e287f8094a96afa4fc8be6c716135370c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Angelovi=C4=8D?= Date: Sat, 3 May 2025 20:40:56 +0200 Subject: [PATCH 3/4] chore(ci): add newer ubuntu image --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60875a36..da734590 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04] + os: [ubuntu-22.04, ubuntu-24.04] compiler: [g++, clang] build: [shared-libsystemd, embedded-static-libsystemd] steps: From 6d5fe3468b62850450fd4c63d80146d369493a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Angelovi=C4=8D?= Date: Mon, 5 May 2025 07:34:33 +0200 Subject: [PATCH 4/4] chore(ci): fix further things --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da734590..4a20a36a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: - name: install-clang if: matrix.compiler == 'clang' run: | - sudo apt-get install -y clang + sudo apt-get install -y clang libc++-dev sudo update-alternatives --remove-all cc sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang 10 sudo update-alternatives --remove-all c++ @@ -44,7 +44,7 @@ jobs: # run: | # sudo apt-get install -y libgmock-dev - name: configure-debug - if: matrix.build == 'shared-libsystemd' && matrix.os == 'ubuntu-22.04' + if: matrix.build == 'shared-libsystemd' run: | mkdir build cd build @@ -65,12 +65,12 @@ jobs: sudo cmake --build . --target install ctest --output-on-failure - name: pack - if: matrix.build == 'shared-libsystemd' && matrix.os == 'ubuntu-22.04' + if: matrix.build == 'shared-libsystemd' run: | cd build cpack -G DEB - name: 'Upload Artifact' - if: matrix.build == 'shared-libsystemd' && matrix.os == 'ubuntu-22.04' && matrix.compiler == 'g++' + if: matrix.build == 'shared-libsystemd' && matrix.compiler == 'g++' uses: actions/upload-artifact@v4 with: name: "debian-packages-${{ matrix.os }}-${{ matrix.compiler }}"