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
17 changes: 4 additions & 13 deletions .github/actions/deb-delivery/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,40 +20,31 @@ inputs:
runs:
using: "composite"
steps:
- if: ${{ ! (inputs.distrib == 'jammy' && inputs.stability == 'stable') }}
- if: ${{ ! (inputs.stability == 'stable') }}
name: Use cache DEB files
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: ./*.deb
key: ${{ inputs.cache_key }}
fail-on-cache-miss: true

- if: ${{ ! (inputs.distrib == 'jammy' && inputs.stability == 'stable') }}
- if: ${{ ! (inputs.stability == 'stable') }}
uses: jfrog/setup-jfrog-cli@1641575d87647fb969c0545f0b6a76873e328b7c # v5.0.0
env:
JF_URL: https://centreon.jfrog.io
JF_ACCESS_TOKEN: ${{ inputs.artifactory_token }}

- if: ${{ ! (inputs.distrib == 'jammy' && inputs.stability == 'stable') }}
- if: ${{ ! (inputs.stability == 'stable') }}
name: Publish DEBs
env:
MODULE_NAME: ${{ inputs.module_name }}
DISTRIB: ${{ inputs.distrib }}
STABILITY: ${{ inputs.stability }}
run: |
FILES="*.deb"

if [[ "$DISTRIB" == "jammy" || "$DISTRIB" == "noble" ]]; then
REPO_PREFIX="ubuntu"
else
REPO_PREFIX="apt"
fi

for FILE in $FILES; do
echo "[DEBUG] - File: $FILE"

ARCH=$(echo $FILE | cut -d '_' -f3 | cut -d '.' -f1)

jf rt upload "$FILE" "${REPO_PREFIX}-plugins-$STABILITY/pool/$MODULE_NAME/" --deb "$DISTRIB/main/$ARCH"
jf rt upload "$FILE" "apt-plugins-$STABILITY/pool/$MODULE_NAME/" --deb "$DISTRIB/main/$ARCH"
done
shell: bash
15 changes: 0 additions & 15 deletions .github/actions/parse-distrib/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ runs:
PACKAGE_DISTRIB_NAME="el10"
PACKAGE_EXTENSION="rpm"
DISTRIB_FAMILY="el"
elif [[ "$DISTRIB" == "bullseye" ]]; then
PACKAGE_DISTRIB_SEPARATOR="+"
PACKAGE_DISTRIB_NAME="deb11u1"
PACKAGE_EXTENSION="deb"
DISTRIB_FAMILY="debian"
elif [[ "$DISTRIB" == "bookworm" ]]; then
PACKAGE_DISTRIB_SEPARATOR="+"
PACKAGE_DISTRIB_NAME="deb12u1"
Expand All @@ -56,16 +51,6 @@ runs:
PACKAGE_DISTRIB_NAME="deb13u1"
PACKAGE_EXTENSION="deb"
DISTRIB_FAMILY="debian"
elif [[ "$DISTRIB" == "jammy" ]]; then
PACKAGE_DISTRIB_SEPARATOR="-"
PACKAGE_DISTRIB_NAME="0ubuntu.22.04"
PACKAGE_EXTENSION="deb"
DISTRIB_FAMILY="ubuntu"
elif [[ "$DISTRIB" == "noble" ]]; then
PACKAGE_DISTRIB_SEPARATOR="-"
PACKAGE_DISTRIB_NAME="0ubuntu.24.04"
PACKAGE_EXTENSION="deb"
DISTRIB_FAMILY="ubuntu"
else
echo "::error::Distrib $DISTRIB cannot be parsed"
exit 1
Expand Down
19 changes: 1 addition & 18 deletions .github/actions/test-packages/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,24 +169,7 @@ runs:
use_standard_stable=true
use_standard_testing=true
use_standard_unstable=true
if [[ "$DISTRIB" == "jammy" ]]; then
standard_base="ubuntu-standard-24.10"
standard_distrib="$DISTRIB"
plugins_prefix="ubuntu-plugins"
new_repo_format=false
elif [[ "$DISTRIB" == "noble" ]]; then
standard_base="ubuntu-standard-24.10"
standard_distrib="$DISTRIB"
plugins_prefix="ubuntu-plugins"
new_repo_format=false
elif [[ "$DISTRIB" == "bullseye" ]]; then
standard_base="apt-standard-24.04"
standard_distrib="$DISTRIB"
plugins_prefix="apt-plugins"
new_repo_format=false
use_standard_testing=false
use_standard_unstable=false
elif [[ "$DISTRIB" == "bookworm" ]]; then
if [[ "$DISTRIB" == "bookworm" ]]; then
standard_base="apt-standard"
standard_distrib="${DISTRIB}-25.10"
plugins_prefix="apt-plugins"
Expand Down

This file was deleted.

This file was deleted.

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, alma10, bookworm, trixie, jammy, noble]
distrib: [alma8, alma9, alma10, bookworm, trixie]
steps:
- name: Checkout sources
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
Expand Down
18 changes: 3 additions & 15 deletions .github/workflows/lua-base64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [el8, el9, el10, bookworm, trixie, jammy, noble]
distrib: [el8, el9, el10, bookworm, trixie]
include:
- package_extension: rpm
image: packaging-stream-connectors-nfpm-alma8
Expand All @@ -49,12 +49,6 @@ jobs:
- 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 @@ -121,12 +115,6 @@ jobs:
- 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 Down Expand Up @@ -179,7 +167,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
distrib: [bookworm, trixie, jammy, noble]
distrib: [bookworm, trixie]
name: deliver ${{ matrix.distrib }}

steps:
Expand All @@ -195,7 +183,7 @@ jobs:
cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-lua-base64-${{ matrix.distrib }}
stability: ${{ needs.get-environment.outputs.stability }}

# pulp mirrors the artifactory delivery above (jammy/noble stay artifactory-only);
# pulp mirrors the artifactory delivery above;
# stable is a promotion of the testing packages, keyed on the release/hotfix branch
deliver-pulp:
if: ${{ contains(fromJson('["unstable", "testing", "stable"]'), needs.get-environment.outputs.stability) }}
Expand Down
24 changes: 4 additions & 20 deletions .github/workflows/lua-cffi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [el8, el9, el10, bookworm, trixie, jammy, noble]
distrib: [el8, el9, el10, bookworm, trixie]
include:
- package_extension: rpm
image: packaging-stream-connectors-nfpm-alma8
Expand All @@ -49,12 +49,6 @@ jobs:
- 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 All @@ -80,11 +74,7 @@ jobs:
else
apt-get update
apt-get install -y make gcc g++ meson cmake libffi-dev
if [ "$DISTRIB" = "bullseye" ]; then
apt-get install -y libffi7
else
apt-get install -y libffi8
fi
apt-get install -y libffi8
fi
shell: bash

Expand Down Expand Up @@ -151,12 +141,6 @@ jobs:
- 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 Down Expand Up @@ -208,7 +192,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
distrib: [bookworm, trixie, jammy, noble]
distrib: [bookworm, trixie]
name: deliver ${{ matrix.distrib }}

steps:
Expand All @@ -224,7 +208,7 @@ jobs:
cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-lua-cffi-${{ matrix.distrib }}
stability: ${{ needs.get-environment.outputs.stability }}

# pulp mirrors the artifactory delivery above (jammy/noble stay artifactory-only);
# pulp mirrors the artifactory delivery above;
# stable is a promotion of the testing packages, keyed on the release/hotfix branch
deliver-pulp:
if: ${{ contains(fromJson('["unstable", "testing", "stable"]'), needs.get-environment.outputs.stability) }}
Expand Down
20 changes: 3 additions & 17 deletions .github/workflows/lua-lsqlite3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [el8, el9, el10, bookworm, trixie, jammy, noble]
distrib: [el8, el9, el10, bookworm, trixie]
include:
- distrib: el8
package_extension: rpm
Expand All @@ -54,14 +54,6 @@ jobs:
package_extension: deb
image: packaging-stream-connectors-nfpm-trixie
lua_version: 5.4
- distrib: jammy
package_extension: deb
image: packaging-stream-connectors-nfpm-jammy
lua_version: 5.3
- distrib: noble
package_extension: deb
image: packaging-stream-connectors-nfpm-noble
lua_version: 5.3

runs-on: ubuntu-24.04

Expand Down Expand Up @@ -141,12 +133,6 @@ jobs:
- 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 Down Expand Up @@ -199,7 +185,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
distrib: [bookworm, trixie, jammy, noble]
distrib: [bookworm, trixie]
name: deliver ${{ matrix.distrib }}

steps:
Expand All @@ -215,7 +201,7 @@ jobs:
cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-lua-lsqlite3-${{ matrix.distrib }}
stability: ${{ needs.get-environment.outputs.stability }}

# pulp mirrors the artifactory delivery above (jammy/noble stay artifactory-only);
# pulp mirrors the artifactory delivery above;
# stable is a promotion of the testing packages, keyed on the release/hotfix branch
deliver-pulp:
if: ${{ contains(fromJson('["unstable", "testing", "stable"]'), needs.get-environment.outputs.stability) }}
Expand Down
18 changes: 3 additions & 15 deletions .github/workflows/lua-openssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [el8, el9, el10, bookworm, trixie, jammy, noble]
distrib: [el8, el9, el10, bookworm, trixie]
include:
- package_extension: rpm
image: packaging-stream-connectors-nfpm-alma8
Expand All @@ -49,12 +49,6 @@ jobs:
- 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 @@ -152,12 +146,6 @@ jobs:
- 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 Down Expand Up @@ -210,7 +198,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
distrib: [bookworm, trixie, jammy, noble]
distrib: [bookworm, trixie]
name: deliver ${{ matrix.distrib }}

steps:
Expand All @@ -226,7 +214,7 @@ jobs:
cache_key: ${{ github.sha }}-${{ github.run_id }}-deb-lua-openssl-${{ matrix.distrib }}
stability: ${{ needs.get-environment.outputs.stability }}

# pulp mirrors the artifactory delivery above (jammy/noble stay artifactory-only);
# pulp mirrors the artifactory delivery above;
# stable is a promotion of the testing packages, keyed on the release/hotfix branch
deliver-pulp:
if: ${{ contains(fromJson('["unstable", "testing", "stable"]'), needs.get-environment.outputs.stability) }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lua-sql-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ jobs:
cache_key: ${{ github.sha }}-${{ github.run_id }}-rpm-lua-sql-mysql-${{ matrix.distrib }}
stability: ${{ needs.get-environment.outputs.stability }}

# pulp mirrors the artifactory delivery above (jammy/noble stay artifactory-only);
# pulp mirrors the artifactory delivery above;
# stable is a promotion of the testing packages, keyed on the release/hotfix branch
deliver-pulp:
if: ${{ contains(fromJson('["unstable", "testing", "stable"]'), needs.get-environment.outputs.stability) }}
Expand Down
Loading
Loading