From 799aa4e2b58f2950f4467d01ca2e43ebf4dcddb3 Mon Sep 17 00:00:00 2001
From: Evan-Adam <152897682+Evan-Adam@users.noreply.github.com>
Date: Wed, 15 May 2024 15:30:30 +0200
Subject: [PATCH] ci(plugin) update JSON::Path dep on alma8 to same version as
 other OS

Alma8 don't provide Exporter::shiny in a recent enough version (provide 1.000000 instead of 1.002002) so we must build this dep.

REF:CTOR-525
---
 .../docker/packaging/Dockerfile.packaging-plugins-alma8   | 2 +-
 .../docker/packaging/Dockerfile.packaging-plugins-alma9   | 2 +-
 .../packaging/Dockerfile.packaging-plugins-bookworm       | 2 +-
 .../packaging/Dockerfile.packaging-plugins-bullseye       | 2 +-
 .../docker/packaging/Dockerfile.packaging-plugins-centos7 | 2 +-
 .../docker/packaging/Dockerfile.packaging-plugins-jammy   | 2 +-
 .github/docker/testing/Dockerfile.testing-plugins-alma8   | 2 +-
 .github/docker/testing/Dockerfile.testing-plugins-alma9   | 2 +-
 .../docker/testing/Dockerfile.testing-plugins-bookworm    | 2 +-
 .../docker/testing/Dockerfile.testing-plugins-bullseye    | 2 +-
 .github/docker/testing/Dockerfile.testing-plugins-jammy   | 2 +-
 .github/workflows/perl-cpan-libraries.yml                 | 4 ++++
 .github/workflows/perl-json-path.yml                      | 8 ++------
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-alma8 b/.github/docker/packaging/Dockerfile.packaging-plugins-alma8
index 11c2ec593b..c8f2f43e77 100644
--- a/.github/docker/packaging/Dockerfile.packaging-plugins-alma8
+++ b/.github/docker/packaging/Dockerfile.packaging-plugins-alma8
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL
+ARG REGISTRY_URL=docker.io
 
 FROM ${REGISTRY_URL}/almalinux:8
 
diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-alma9 b/.github/docker/packaging/Dockerfile.packaging-plugins-alma9
index bdd7f8d725..bb4edb2293 100644
--- a/.github/docker/packaging/Dockerfile.packaging-plugins-alma9
+++ b/.github/docker/packaging/Dockerfile.packaging-plugins-alma9
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL
+ARG REGISTRY_URL=docker.io
 
 FROM ${REGISTRY_URL}/almalinux:9
 
diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-bookworm b/.github/docker/packaging/Dockerfile.packaging-plugins-bookworm
index caf7d402a9..476a9875cc 100644
--- a/.github/docker/packaging/Dockerfile.packaging-plugins-bookworm
+++ b/.github/docker/packaging/Dockerfile.packaging-plugins-bookworm
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL
+ARG REGISTRY_URL=docker.io
 
 FROM ${REGISTRY_URL}/debian:bookworm
 
diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-bullseye b/.github/docker/packaging/Dockerfile.packaging-plugins-bullseye
index a8cef0424f..413aff6151 100644
--- a/.github/docker/packaging/Dockerfile.packaging-plugins-bullseye
+++ b/.github/docker/packaging/Dockerfile.packaging-plugins-bullseye
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL
+ARG REGISTRY_URL=docker.io
 
 FROM ${REGISTRY_URL}/debian:bullseye
 
diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-centos7 b/.github/docker/packaging/Dockerfile.packaging-plugins-centos7
index 78561500f4..3fd80dd488 100644
--- a/.github/docker/packaging/Dockerfile.packaging-plugins-centos7
+++ b/.github/docker/packaging/Dockerfile.packaging-plugins-centos7
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL
+ARG REGISTRY_URL=docker.io
 
 FROM ${REGISTRY_URL}/centos:7
 
diff --git a/.github/docker/packaging/Dockerfile.packaging-plugins-jammy b/.github/docker/packaging/Dockerfile.packaging-plugins-jammy
index 234348e1fc..26579efcdb 100644
--- a/.github/docker/packaging/Dockerfile.packaging-plugins-jammy
+++ b/.github/docker/packaging/Dockerfile.packaging-plugins-jammy
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL
+ARG REGISTRY_URL=docker.io
 
 FROM ${REGISTRY_URL}/ubuntu:jammy
 
diff --git a/.github/docker/testing/Dockerfile.testing-plugins-alma8 b/.github/docker/testing/Dockerfile.testing-plugins-alma8
index 47c2ffdba0..22d2d9c07a 100644
--- a/.github/docker/testing/Dockerfile.testing-plugins-alma8
+++ b/.github/docker/testing/Dockerfile.testing-plugins-alma8
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL
+ARG REGISTRY_URL=docker.io
 
 FROM ${REGISTRY_URL}/almalinux:8
 
diff --git a/.github/docker/testing/Dockerfile.testing-plugins-alma9 b/.github/docker/testing/Dockerfile.testing-plugins-alma9
index 6761366c85..d5cead3a20 100644
--- a/.github/docker/testing/Dockerfile.testing-plugins-alma9
+++ b/.github/docker/testing/Dockerfile.testing-plugins-alma9
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL
+ARG REGISTRY_URL=docker.io
 
 FROM ${REGISTRY_URL}/almalinux:9
 
diff --git a/.github/docker/testing/Dockerfile.testing-plugins-bookworm b/.github/docker/testing/Dockerfile.testing-plugins-bookworm
index 2ff56f473d..95ae97a301 100644
--- a/.github/docker/testing/Dockerfile.testing-plugins-bookworm
+++ b/.github/docker/testing/Dockerfile.testing-plugins-bookworm
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL
+ARG REGISTRY_URL=docker.io
 
 FROM ${REGISTRY_URL}/debian:bookworm
 
diff --git a/.github/docker/testing/Dockerfile.testing-plugins-bullseye b/.github/docker/testing/Dockerfile.testing-plugins-bullseye
index 72c2b2ec6a..982506b7d5 100644
--- a/.github/docker/testing/Dockerfile.testing-plugins-bullseye
+++ b/.github/docker/testing/Dockerfile.testing-plugins-bullseye
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL
+ARG REGISTRY_URL=docker.io
 
 FROM ${REGISTRY_URL}/debian:bullseye
 
diff --git a/.github/docker/testing/Dockerfile.testing-plugins-jammy b/.github/docker/testing/Dockerfile.testing-plugins-jammy
index 9df67d9d98..eb2a5920dc 100644
--- a/.github/docker/testing/Dockerfile.testing-plugins-jammy
+++ b/.github/docker/testing/Dockerfile.testing-plugins-jammy
@@ -1,4 +1,4 @@
-ARG REGISTRY_URL
+ARG REGISTRY_URL=docker.io
 
 FROM ${REGISTRY_URL}/ubuntu:jammy
 
diff --git a/.github/workflows/perl-cpan-libraries.yml b/.github/workflows/perl-cpan-libraries.yml
index 16ba4b17c8..396a5f57ac 100644
--- a/.github/workflows/perl-cpan-libraries.yml
+++ b/.github/workflows/perl-cpan-libraries.yml
@@ -53,6 +53,7 @@ jobs:
             "Digest::MD5::File",
             "Digest::SHA1",
             "Email::Send::SMTP::Gmail",
+            "Exporter::Shiny",
             "EV",
             "FFI::CheckLib",
             "FFI::Platypus",
@@ -121,6 +122,8 @@ jobs:
             version: "0.022"
           - name: "Device::Modbus::TCP::Client"
             version: "0.026"
+          - name: "Exporter::Shiny"
+            build_distribs: el8
           - name: "EV"
           - name: "FFI::CheckLib"
           - name: "FFI::Platypus"
@@ -140,6 +143,7 @@ jobs:
             use_dh_make_perl: "false"
             version: "0.01"
             rpm_dependencies: "zeromq"
+
     name: package ${{ matrix.distrib }} ${{ matrix.name }}
     container:
       image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ matrix.image }}:latest
diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml
index f3206b70b1..d128646f97 100644
--- a/.github/workflows/perl-json-path.yml
+++ b/.github/workflows/perl-json-path.yml
@@ -69,11 +69,8 @@ jobs:
             dnf install -y cpanminus gcc
           fi
 
-          if [ "${{ matrix.distrib }}" = "el8" ]; then
-            cpanm -v -l /tmp JSON::Path@0.5
-          else
-            cpanm -v -l /tmp JSON::Path@1.0.4
-          fi
+          cpanm -v -l /tmp JSON::Path@1.0.4
+
         shell: bash
 
       - name: Set package name and paths according to distrib
@@ -90,7 +87,6 @@ jobs:
           else
             NAME="perl-JSON-Path"
             if [ "${{ matrix.distrib }}" = "el8" ]; then
-              VERSION="0.5" # https://github.com/centreon/centreon-plugins/issues/4540
               PERL_VENDORLIB="/usr/local/share/perl5"
             else
               PERL_VENDORLIB="/usr/local/share/perl5/$PERL_VERSION"