Skip to content

Commit

Permalink
ci(plugin) update JSON::Path dep on alma8 to same version as other OS
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Evan-Adam authored May 15, 2024
1 parent 531ac59 commit 799aa4e
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG REGISTRY_URL
ARG REGISTRY_URL=docker.io

FROM ${REGISTRY_URL}/almalinux:8

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG REGISTRY_URL
ARG REGISTRY_URL=docker.io

FROM ${REGISTRY_URL}/almalinux:9

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG REGISTRY_URL
ARG REGISTRY_URL=docker.io

FROM ${REGISTRY_URL}/debian:bookworm

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG REGISTRY_URL
ARG REGISTRY_URL=docker.io

FROM ${REGISTRY_URL}/debian:bullseye

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG REGISTRY_URL
ARG REGISTRY_URL=docker.io

FROM ${REGISTRY_URL}/centos:7

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG REGISTRY_URL
ARG REGISTRY_URL=docker.io

FROM ${REGISTRY_URL}/ubuntu:jammy

Expand Down
2 changes: 1 addition & 1 deletion .github/docker/testing/Dockerfile.testing-plugins-alma8
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG REGISTRY_URL
ARG REGISTRY_URL=docker.io

FROM ${REGISTRY_URL}/almalinux:8

Expand Down
2 changes: 1 addition & 1 deletion .github/docker/testing/Dockerfile.testing-plugins-alma9
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG REGISTRY_URL
ARG REGISTRY_URL=docker.io

FROM ${REGISTRY_URL}/almalinux:9

Expand Down
2 changes: 1 addition & 1 deletion .github/docker/testing/Dockerfile.testing-plugins-bookworm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG REGISTRY_URL
ARG REGISTRY_URL=docker.io

FROM ${REGISTRY_URL}/debian:bookworm

Expand Down
2 changes: 1 addition & 1 deletion .github/docker/testing/Dockerfile.testing-plugins-bullseye
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG REGISTRY_URL
ARG REGISTRY_URL=docker.io

FROM ${REGISTRY_URL}/debian:bullseye

Expand Down
2 changes: 1 addition & 1 deletion .github/docker/testing/Dockerfile.testing-plugins-jammy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG REGISTRY_URL
ARG REGISTRY_URL=docker.io

FROM ${REGISTRY_URL}/ubuntu:jammy

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/perl-cpan-libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
"Digest::MD5::File",
"Digest::SHA1",
"Email::Send::SMTP::Gmail",
"Exporter::Shiny",
"EV",
"FFI::CheckLib",
"FFI::Platypus",
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/perl-json-path.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,8 @@ jobs:
dnf install -y cpanminus gcc
fi
if [ "${{ matrix.distrib }}" = "el8" ]; then
cpanm -v -l /tmp JSON::[email protected]
else
cpanm -v -l /tmp JSON::[email protected]
fi
cpanm -v -l /tmp JSON::[email protected]
shell: bash

- name: Set package name and paths according to distrib
Expand All @@ -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"
Expand Down

0 comments on commit 799aa4e

Please sign in to comment.