From c83d25a3f6523999c978caf6ed973d044fa6bbe8 Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Thu, 30 Apr 2026 11:41:29 +0200 Subject: [PATCH 1/8] enh(ci): deliver centreon stream connectors for debian 13, rhel 10 and noble --- .github/actions/deb-delivery/action.yml | 2 +- ...le.packaging-stream-connectors-nfpm-alma10 | 19 +++++++++++++++ ...ile.packaging-stream-connectors-nfpm-noble | 17 +++++++++++++ ...le.packaging-stream-connectors-nfpm-trixie | 17 +++++++++++++ .github/workflows/docker-packaging.yml | 2 +- .github/workflows/lua-cffi.yml | 24 ++++++++++++++++--- .github/workflows/lua-sql-mysql.yml | 14 +++++++---- .github/workflows/lua-tz.yml | 24 ++++++++++++++++--- .github/workflows/stream-connectors-lib.yml | 15 +++++++++--- .github/workflows/stream-connectors.yml | 15 +++++++++--- 10 files changed, 131 insertions(+), 18 deletions(-) create mode 100644 .github/docker/Dockerfile.packaging-stream-connectors-nfpm-alma10 create mode 100644 .github/docker/Dockerfile.packaging-stream-connectors-nfpm-noble create mode 100644 .github/docker/Dockerfile.packaging-stream-connectors-nfpm-trixie diff --git a/.github/actions/deb-delivery/action.yml b/.github/actions/deb-delivery/action.yml index 9723d17d..edbd915d 100644 --- a/.github/actions/deb-delivery/action.yml +++ b/.github/actions/deb-delivery/action.yml @@ -43,7 +43,7 @@ runs: run: | FILES="*.deb" - if [[ "$DISTRIB" == "jammy" ]]; then + if [[ "$DISTRIB" == "jammy" || "$DISTRIB" == "noble" ]]; then REPO_PREFIX="ubuntu" else REPO_PREFIX="apt" diff --git a/.github/docker/Dockerfile.packaging-stream-connectors-nfpm-alma10 b/.github/docker/Dockerfile.packaging-stream-connectors-nfpm-alma10 new file mode 100644 index 00000000..16cbbd86 --- /dev/null +++ b/.github/docker/Dockerfile.packaging-stream-connectors-nfpm-alma10 @@ -0,0 +1,19 @@ +ARG REGISTRY_URL=docker.centreon.com/centreon + +FROM ${REGISTRY_URL}/almalinux:10 + +RUN bash -e < Date: Thu, 30 Apr 2026 12:05:13 +0200 Subject: [PATCH 2/8] fix lua-cffi for el10 --- .github/workflows/lua-cffi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lua-cffi.yml b/.github/workflows/lua-cffi.yml index 01f74002..5ff5258e 100644 --- a/.github/workflows/lua-cffi.yml +++ b/.github/workflows/lua-cffi.yml @@ -105,7 +105,7 @@ jobs: cd cffi-lua-src mkdir build cd build - if [ "$DISTRIB" = "el9" ]; then + if [[ "$DISTRIB" = "el9" || "$DISTRIB" = "el10" ]]; then meson .. -Dlua_version=5.4 else meson .. -Dlua_version=5.3 From 4503372df4d0321987828a964a132fe252adafe8 Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Thu, 30 Apr 2026 12:44:41 +0200 Subject: [PATCH 3/8] fix mysql for el10 and update libs workflows --- .github/workflows/lua-cffi.yml | 4 ++-- .github/workflows/lua-sql-mysql.yml | 7 ++++++- .github/workflows/lua-tz.yml | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lua-cffi.yml b/.github/workflows/lua-cffi.yml index 5ff5258e..a4dabaa3 100644 --- a/.github/workflows/lua-cffi.yml +++ b/.github/workflows/lua-cffi.yml @@ -187,7 +187,7 @@ jobs: deliver-rpm: if: ${{ contains(fromJson('["unstable", "testing", "stable"]'), needs.get-environment.outputs.stability) }} - needs: [get-environment, package] + needs: [get-environment, package, test-packages] runs-on: ubuntu-24.04 strategy: matrix: @@ -209,7 +209,7 @@ jobs: deliver-deb: if: ${{ contains(fromJson('["unstable", "testing", "stable"]'), needs.get-environment.outputs.stability) }} - needs: [get-environment, package] + needs: [get-environment, package, test-packages] runs-on: ubuntu-24.04 strategy: matrix: diff --git a/.github/workflows/lua-sql-mysql.yml b/.github/workflows/lua-sql-mysql.yml index 58530aa7..a07af08d 100644 --- a/.github/workflows/lua-sql-mysql.yml +++ b/.github/workflows/lua-sql-mysql.yml @@ -77,6 +77,11 @@ jobs: dnf config-manager --set-enabled crb fi dnf install -y make gcc lua lua-devel mysql mysql-devel + if [ "$DISTRIB" == "el10" ]; then + dnf install -y mysql8.4 mysql8.4-devel + else + dnf install -y mysql mysql-devel + fi cd lua-sql-src make mysql DRIVER_LIBS_mysql="-L/usr/lib64/mysql -lmysqlclient" DRIVER_INCS_mysql=-I/usr/include/mysql LUA_SYS_VER="$LUA_VERSION" cd .. @@ -141,7 +146,7 @@ jobs: deliver-rpm: if: ${{ contains(fromJson('["unstable", "testing", "stable"]'), needs.get-environment.outputs.stability) }} - needs: [get-environment, package] + needs: [get-environment, package, test-packages] runs-on: ubuntu-24.04 strategy: matrix: diff --git a/.github/workflows/lua-tz.yml b/.github/workflows/lua-tz.yml index 1f41fa5d..4e231988 100644 --- a/.github/workflows/lua-tz.yml +++ b/.github/workflows/lua-tz.yml @@ -156,7 +156,7 @@ jobs: deliver-rpm: if: ${{ contains(fromJson('["unstable", "testing", "stable"]'), needs.get-environment.outputs.stability) }} - needs: [get-environment, package] + needs: [get-environment, package, test-packages] runs-on: ubuntu-24.04 strategy: matrix: @@ -178,7 +178,7 @@ jobs: deliver-deb: if: ${{ contains(fromJson('["unstable", "testing", "stable"]'), needs.get-environment.outputs.stability) }} - needs: [get-environment, package] + needs: [get-environment, package, test-packages] runs-on: ubuntu-24.04 strategy: matrix: From 07f5737f8df3a5a326177b1310a514f102691ada Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Thu, 30 Apr 2026 15:44:39 +0200 Subject: [PATCH 4/8] fix --- .github/workflows/lua-sql-mysql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lua-sql-mysql.yml b/.github/workflows/lua-sql-mysql.yml index a07af08d..8e03aea9 100644 --- a/.github/workflows/lua-sql-mysql.yml +++ b/.github/workflows/lua-sql-mysql.yml @@ -76,7 +76,7 @@ jobs: else dnf config-manager --set-enabled crb fi - dnf install -y make gcc lua lua-devel mysql mysql-devel + dnf install -y make gcc lua lua-devel if [ "$DISTRIB" == "el10" ]; then dnf install -y mysql8.4 mysql8.4-devel else From 1b59f7ea4e0cc0a1261bc023a83ad56cbbf4a64c Mon Sep 17 00:00:00 2001 From: Sophie Depassio Date: Thu, 30 Apr 2026 16:14:36 +0200 Subject: [PATCH 5/8] fix mysql version for el10 --- .github/workflows/lua-sql-mysql.yml | 8 ++++---- dependencies/lua-sql-mysql/packaging/lua-sql-mysql.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lua-sql-mysql.yml b/.github/workflows/lua-sql-mysql.yml index 8e03aea9..4b9f1f94 100644 --- a/.github/workflows/lua-sql-mysql.yml +++ b/.github/workflows/lua-sql-mysql.yml @@ -76,17 +76,17 @@ jobs: else dnf config-manager --set-enabled crb fi - dnf install -y make gcc lua lua-devel + MYSQL_VERSION="" if [ "$DISTRIB" == "el10" ]; then - dnf install -y mysql8.4 mysql8.4-devel - else - dnf install -y mysql mysql-devel + MYSQL_VERSION="8.4" fi + dnf install -y make gcc lua lua-devel mysql$MYSQL_VERSION mysql$MYSQL_VERSION-devel cd lua-sql-src make mysql DRIVER_LIBS_mysql="-L/usr/lib64/mysql -lmysqlclient" DRIVER_INCS_mysql=-I/usr/include/mysql LUA_SYS_VER="$LUA_VERSION" cd .. sed -i "s/@luaver@/${LUA_VERSION}/g" dependencies/lua-sql-mysql/packaging/lua-sql-mysql.yaml + sed -i "s/@mysql_version@/${MYSQL_VERSION}/g" dependencies/lua-sql-mysql/packaging/lua-sql-mysql.yaml shell: bash - name: Package diff --git a/dependencies/lua-sql-mysql/packaging/lua-sql-mysql.yaml b/dependencies/lua-sql-mysql/packaging/lua-sql-mysql.yaml index 9d7ba6b9..72c3b958 100644 --- a/dependencies/lua-sql-mysql/packaging/lua-sql-mysql.yaml +++ b/dependencies/lua-sql-mysql/packaging/lua-sql-mysql.yaml @@ -25,7 +25,7 @@ overrides: rpm: depends: - lua - - mysql-libs + - mysql@mysql_version@-libs rpm: summary: LuaSQL MySQL From c3e3961b237da0c0b5ed2b8cb94abd225bd6d4e9 Mon Sep 17 00:00:00 2001 From: sdepassio <114986849+sdepassio@users.noreply.github.com> Date: Mon, 4 May 2026 15:03:06 +0200 Subject: [PATCH 6/8] Update .github/docker/Dockerfile.packaging-stream-connectors-nfpm-noble Co-authored-by: tuntoja <58987095+tuntoja@users.noreply.github.com> --- .../docker/Dockerfile.packaging-stream-connectors-nfpm-noble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker/Dockerfile.packaging-stream-connectors-nfpm-noble b/.github/docker/Dockerfile.packaging-stream-connectors-nfpm-noble index 8f0c30d4..35348e4a 100644 --- a/.github/docker/Dockerfile.packaging-stream-connectors-nfpm-noble +++ b/.github/docker/Dockerfile.packaging-stream-connectors-nfpm-noble @@ -1,6 +1,6 @@ ARG REGISTRY_URL=docker.centreon.com/centreon -FROM ${REGISTRY_URL}/ubuntu:jammy +FROM ${REGISTRY_URL}/ubuntu:noble RUN bash -e < Date: Mon, 4 May 2026 15:03:18 +0200 Subject: [PATCH 7/8] Update .github/docker/Dockerfile.packaging-stream-connectors-nfpm-trixie Co-authored-by: tuntoja <58987095+tuntoja@users.noreply.github.com> --- .../docker/Dockerfile.packaging-stream-connectors-nfpm-trixie | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker/Dockerfile.packaging-stream-connectors-nfpm-trixie b/.github/docker/Dockerfile.packaging-stream-connectors-nfpm-trixie index afd4ffc8..b8629c20 100644 --- a/.github/docker/Dockerfile.packaging-stream-connectors-nfpm-trixie +++ b/.github/docker/Dockerfile.packaging-stream-connectors-nfpm-trixie @@ -1,6 +1,6 @@ ARG REGISTRY_URL=docker.centreon.com/centreon -FROM ${REGISTRY_URL}/debian:bookworm +FROM ${REGISTRY_URL}/debian:trixie RUN bash -e < Date: Mon, 4 May 2026 15:23:44 +0200 Subject: [PATCH 8/8] update cache actions versions --- .github/actions/deb-delivery/action.yml | 2 +- .github/actions/package-nfpm/action.yml | 2 +- .github/actions/rpm-delivery/action.yml | 2 +- .github/actions/test-packages/action.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/deb-delivery/action.yml b/.github/actions/deb-delivery/action.yml index edbd915d..8f5a5909 100644 --- a/.github/actions/deb-delivery/action.yml +++ b/.github/actions/deb-delivery/action.yml @@ -22,7 +22,7 @@ runs: steps: - if: ${{ ! (inputs.distrib == 'jammy' && inputs.stability == 'stable') }} name: Use cache DEB files - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4 with: path: ./*.deb key: ${{ inputs.cache_key }} diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index a80e492c..69240563 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -104,7 +104,7 @@ runs: shell: bash - name: Cache packages - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4 with: path: ./*.${{ inputs.package_extension }} key: ${{ inputs.cache_key }} diff --git a/.github/actions/rpm-delivery/action.yml b/.github/actions/rpm-delivery/action.yml index 05c4d9bc..ba267e90 100644 --- a/.github/actions/rpm-delivery/action.yml +++ b/.github/actions/rpm-delivery/action.yml @@ -21,7 +21,7 @@ runs: using: "composite" steps: - name: Use cache RPM files - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4 with: path: ./*.rpm key: ${{ inputs.cache_key }} diff --git a/.github/actions/test-packages/action.yml b/.github/actions/test-packages/action.yml index 0a5ebec6..aa87a545 100644 --- a/.github/actions/test-packages/action.yml +++ b/.github/actions/test-packages/action.yml @@ -37,7 +37,7 @@ runs: shell: bash - name: Restore packages from cache - uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 + uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4 with: path: ./*.${{ inputs.package_extension }} key: ${{ inputs.cache_key }}