diff --git a/.github/scripts/prepare-package-plugins.sh b/.github/scripts/prepare-package-plugins.sh index b7c9dc5218..1d77d7fb70 100755 --- a/.github/scripts/prepare-package-plugins.sh +++ b/.github/scripts/prepare-package-plugins.sh @@ -2,6 +2,7 @@ plugins_json_file="$1" package_extension="$2" +package_distrib="$3" for PLUGIN in $(jq -r 'to_entries[] | select(.value.build == true) | .key' $plugins_json_file); do PACKAGE_PATH=$PLUGIN @@ -26,8 +27,8 @@ for PLUGIN in $(jq -r 'to_entries[] | select(.value.build == true) | .key' $plug conflicts=$(jq -r '.conflicts // [] | join(",")' "$PACKAGE_FILE") replaces=$(jq -r '.replaces // [] | join(",")' "$PACKAGE_FILE") provides=$(jq -r '.provides // [] | join(",")' "$PACKAGE_FILE") - deb_dependencies=$(jq -r '.dependencies // [] | join(",")' "$DEB_PACKAGE_FILE") - rpm_dependencies=$(jq -r '.dependencies // [] | join(",")' "$RPM_PACKAGE_FILE") + deb_dependencies=$(jq -r '(.dependencies // []) + (.dependencies_'$package_distrib' // []) | join(",")' "$DEB_PACKAGE_FILE") + rpm_dependencies=$(jq -r '(.dependencies // []) + (.dependencies_'$package_distrib' // []) | join(",")' "$RPM_PACKAGE_FILE") deb_conflicts=$(jq -r '.conflicts // [] | join(",")' "$DEB_PACKAGE_FILE") rpm_conflicts=$(jq -r '.conflicts // [] | join(",")' "$RPM_PACKAGE_FILE") deb_replaces=$(jq -r '.replaces // [] | join(",")' "$DEB_PACKAGE_FILE") @@ -62,4 +63,4 @@ for PLUGIN in $(jq -r 'to_entries[] | select(.value.build == true) | .key' $plug cat .github/packaging/$PLUGIN.yaml echo "::endgroup::" -done \ No newline at end of file +done diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml index 305edb0c12..4b28703ee2 100644 --- a/.github/workflows/plugins.yml +++ b/.github/workflows/plugins.yml @@ -310,7 +310,7 @@ jobs: fail-on-cache-miss: true - run: | - .github/scripts/prepare-package-plugins.sh "plugins.json" "${{ matrix.package_extension }}" + .github/scripts/prepare-package-plugins.sh "plugins.json" "${{ matrix.package_extension }}" "${{ matrix.distrib }}" shell: bash - uses: ./.github/actions/package-nfpm diff --git a/packaging/centreon-plugin-Applications-Databases-Mssql/rpm.json b/packaging/centreon-plugin-Applications-Databases-Mssql/rpm.json index 5a0276c883..ec8f6145ce 100644 --- a/packaging/centreon-plugin-Applications-Databases-Mssql/rpm.json +++ b/packaging/centreon-plugin-Applications-Databases-Mssql/rpm.json @@ -5,7 +5,12 @@ "perl(Time::HiRes)", "perl(POSIX)", "perl(DBD::Sybase)", - "freetds", "unixODBC" + ], + "dependencies_el8": [ + "freetds" + ], + "dependencies_el9": [ + "freetds >= 1.4.23" ] -} \ No newline at end of file +}