Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/deb-delivery/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/package-nfpm/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/rpm-delivery/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test-packages/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
ARG REGISTRY_URL=docker.centreon.com/centreon

FROM ${REGISTRY_URL}/almalinux:10

RUN bash -e <<EOF

dnf install -y dnf-plugins-core epel-release
dnf config-manager --set-enabled crb

echo '[goreleaser]
name=GoReleaser
baseurl=https://repo.goreleaser.com/yum/
enabled=1
gpgcheck=0' | tee /etc/yum.repos.d/goreleaser.repo

dnf install -y git zstd nfpm-2.35.2 lua lua-devel
dnf clean all

EOF
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ARG REGISTRY_URL=docker.centreon.com/centreon

FROM ${REGISTRY_URL}/ubuntu:noble

RUN bash -e <<EOF

apt-get update
apt-get install -y git zstd ca-certificates lua5.3 liblua5.3-dev

echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list

apt-get update
apt-get install -y nfpm=2.35.2

apt-get clean

EOF
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ARG REGISTRY_URL=docker.centreon.com/centreon

FROM ${REGISTRY_URL}/debian:trixie

RUN bash -e <<EOF

apt-get update
apt-get install -y git zstd ca-certificates lua5.3 liblua5.3-dev

echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list

apt-get update
apt-get install -y nfpm=2.35.2

apt-get clean

EOF
2 changes: 1 addition & 1 deletion .github/workflows/docker-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

strategy:
matrix:
distrib: [alma8, alma9, bullseye, bookworm, jammy]
distrib: [alma8, alma9, alma10, bullseye, bookworm, trixie, jammy, noble]
steps:
- name: Checkout sources
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
Expand Down
30 changes: 24 additions & 6 deletions .github/workflows/lua-cffi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,32 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [el8, el9, bullseye, bookworm, jammy]
distrib: [el8, el9, el10, bullseye, bookworm, trixie, jammy, noble]
include:
- package_extension: rpm
image: packaging-stream-connectors-nfpm-alma8
distrib: el8
- package_extension: rpm
image: packaging-stream-connectors-nfpm-alma9
distrib: el9
- package_extension: rpm
image: packaging-stream-connectors-nfpm-alma10
distrib: el10
- package_extension: deb
image: packaging-stream-connectors-nfpm-bullseye
distrib: bullseye
- package_extension: deb
image: packaging-stream-connectors-nfpm-bookworm
distrib: bookworm
- package_extension: deb
image: packaging-stream-connectors-nfpm-trixie
distrib: trixie
- package_extension: deb
image: packaging-stream-connectors-nfpm-jammy
distrib: jammy
- package_extension: deb
image: packaging-stream-connectors-nfpm-noble
distrib: noble

runs-on: ubuntu-24.04

Expand Down Expand Up @@ -96,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
Expand Down Expand Up @@ -136,15 +145,24 @@ jobs:
- package_extension: rpm
image: almalinux:9
distrib: el9
- package_extension: rpm
image: almalinux:10
distrib: el10
- package_extension: deb
image: debian:bullseye
distrib: bullseye
- package_extension: deb
image: debian:bookworm
distrib: bookworm
- package_extension: deb
image: debian:trixie
distrib: trixie
- package_extension: deb
image: ubuntu:jammy
distrib: jammy
- package_extension: deb
image: ubuntu:noble
distrib: noble
runs-on: ubuntu-24.04
container:
image: ${{ matrix.image }}
Expand All @@ -169,11 +187,11 @@ 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:
distrib: [el8, el9]
distrib: [el8, el9, el10]
name: deliver ${{ matrix.distrib }}

steps:
Expand All @@ -191,11 +209,11 @@ 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:
distrib: [bullseye, bookworm, jammy]
distrib: [bullseye, bookworm, trixie, jammy, noble]
name: deliver ${{ matrix.distrib }}

steps:
Expand Down
23 changes: 17 additions & 6 deletions .github/workflows/lua-sql-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,17 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [el8, el9]
distrib: [el8, el9, el10]
include:
- image: packaging-stream-connectors-nfpm-alma8
distrib: el8
lua_version: 5.3
- image: packaging-stream-connectors-nfpm-alma9
distrib: el9
lua_version: 5.4
- image: packaging-stream-connectors-nfpm-alma10
distrib: el10
lua_version: 5.4

runs-on: ubuntu-24.04

Expand All @@ -60,7 +63,7 @@ jobs:
with:
repository: "lunarmodules/luasql"
path: "lua-sql-src"
ref: "2.6.0"
ref: "2.7.0"

- name: Prepare packaging of lua-sql-mysql
env:
Expand All @@ -73,12 +76,17 @@ jobs:
else
dnf config-manager --set-enabled crb
fi
dnf install -y make gcc lua lua-devel mysql mysql-devel
MYSQL_VERSION=""
if [ "$DISTRIB" == "el10" ]; then
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
Expand All @@ -88,7 +96,7 @@ jobs:
distrib: ${{ matrix.distrib }}
package_extension: rpm
arch: amd64
version: "2.6.0"
version: "2.7.0"
release: "1"
commit_hash: ${{ github.sha }}
cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-lua-sql-mysql-${{ matrix.distrib }}
Expand All @@ -110,6 +118,9 @@ jobs:
- package_extension: rpm
image: almalinux:9
distrib: el9
- package_extension: rpm
image: almalinux:10
distrib: el10

runs-on: ubuntu-24.04
container:
Expand All @@ -135,11 +146,11 @@ 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:
distrib: [el8, el9]
distrib: [el8, el9, el10]
name: deliver ${{ matrix.distrib }}

steps:
Expand Down
28 changes: 23 additions & 5 deletions .github/workflows/lua-tz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,32 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [el8, el9, bullseye, bookworm, jammy]
distrib: [el8, el9, el10, bullseye, bookworm, trixie, jammy, noble]
include:
- package_extension: rpm
image: packaging-stream-connectors-nfpm-alma8
distrib: el8
- package_extension: rpm
image: packaging-stream-connectors-nfpm-alma9
distrib: el9
- package_extension: rpm
image: packaging-stream-connectors-nfpm-alma10
distrib: el10
- package_extension: deb
image: packaging-stream-connectors-nfpm-bullseye
distrib: bullseye
- package_extension: deb
image: packaging-stream-connectors-nfpm-bookworm
distrib: bookworm
- package_extension: deb
image: packaging-stream-connectors-nfpm-trixie
distrib: trixie
- package_extension: deb
image: packaging-stream-connectors-nfpm-jammy
distrib: jammy
- package_extension: deb
image: packaging-stream-connectors-nfpm-noble
distrib: noble

runs-on: ubuntu-24.04

Expand Down Expand Up @@ -104,15 +113,24 @@ jobs:
- package_extension: rpm
image: almalinux:9
distrib: el9
- package_extension: rpm
image: almalinux:10
distrib: el10
- package_extension: deb
image: debian:bullseye
distrib: bullseye
- package_extension: deb
image: debian:bookworm
distrib: bookworm
- package_extension: deb
image: debian:trixie
distrib: trixie
- package_extension: deb
image: ubuntu:jammy
distrib: jammy
- package_extension: deb
image: ubuntu:noble
distrib: noble

runs-on: ubuntu-24.04
container:
Expand All @@ -138,11 +156,11 @@ 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:
distrib: [el8, el9]
distrib: [el8, el9, el10]
name: deliver ${{ matrix.distrib }}

steps:
Expand All @@ -160,11 +178,11 @@ 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:
distrib: [bullseye, bookworm, jammy]
distrib: [bullseye, bookworm, trixie, jammy, noble]
name: deliver ${{ matrix.distrib }}

steps:
Expand Down
Loading
Loading