From a7e3f8650e3f9fdf52586284953d48216a7539ad Mon Sep 17 00:00:00 2001 From: thebaptiste Date: Fri, 6 Jun 2025 07:55:38 +0000 Subject: [PATCH 1/6] feat: add test on rockylinux/rockylinux:9.6 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50729d6..19158ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,6 +51,7 @@ jobs: - rockylinux:9.3 - rockylinux/rockylinux:9.4 - rockylinux/rockylinux:9.5 + - rockylinux/rockylinux:9.6 - fedora:34 - fedora:35 - fedora:36 From 7cf63dfdd8a8931240148765ad1e2c06ff2bfb79 Mon Sep 17 00:00:00 2001 From: thebaptiste Date: Thu, 12 Jun 2025 13:38:21 +0000 Subject: [PATCH 2/6] feat: add Metwork installation test on rockylinux 10.0 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19158ee..c55d7a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,7 @@ jobs: - rockylinux/rockylinux:9.4 - rockylinux/rockylinux:9.5 - rockylinux/rockylinux:9.6 + - rockylinux/rockylinux:10.0 - fedora:34 - fedora:35 - fedora:36 From ea505c6463920b6304810737a51aae2ab390a0f9 Mon Sep 17 00:00:00 2001 From: thebaptiste Date: Thu, 12 Jun 2025 15:16:43 +0000 Subject: [PATCH 3/6] build: add epel-release --- .github/workflows/ci.yml | 2 +- .github/workflows/integration_tests.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c55d7a2..6a2462e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ jobs: - name: install git rocky if: ${{ startsWith(matrix.container, 'rockylinux:') }} run: | - yum -y install git + yum -y install git epel-release - name: install git alma if: ${{ startsWith(matrix.container, 'almalinux:') }} run: | diff --git a/.github/workflows/integration_tests.sh b/.github/workflows/integration_tests.sh index 55712e8..4b2d5f9 100755 --- a/.github/workflows/integration_tests.sh +++ b/.github/workflows/integration_tests.sh @@ -47,11 +47,12 @@ if test "${BACKEND}" = "dnf"; then echo "gpgcheck=0" >>/etc/yum.repos.d/metwork.repo echo "enabled=1" >>/etc/yum.repos.d/metwork.repo echo "metadata_expire=0" >>/etc/yum.repos.d/metwork.repo + dnf -y install epel-release dnf -y install metwork-mfext-full metwork-mfext-layer-python3_scientific metwork-mfext-layer-python3_extratools metwork-mfext-layer-python3_mapserverapi metwork-mfext-layer-python3_ia metwork-mfext-layer-python3_radartools mkdir mfext mfextaddon_scientific mfextaddon_mapserver mfextaddon_python3_ia mfextaddon_radartools dnf -y install metwork-mfserv metwork-mfdata metwork-mfbase metwork-mfadmin metwork-mfsysmon mkdir mfserv mfdata mfbase mfadmin mfsysmon - yum -y install make cronie diffutils acl + dnf -y install make cronie diffutils acl cd mfext git clone -b ${BRANCH} https://github.com/metwork-framework/mfext src cd src/integration_tests && /opt/metwork-mfext/bin/mfext_wrapper ./run_integration_tests.sh From 8b3ca10585e4dc7757feaadc924b364f63ed2f5b Mon Sep 17 00:00:00 2001 From: thebaptiste Date: Thu, 12 Jun 2025 15:29:08 +0000 Subject: [PATCH 4/6] build: no epel-release on fedora --- .github/workflows/integration_tests.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/integration_tests.sh b/.github/workflows/integration_tests.sh index 4b2d5f9..9a7a4d9 100755 --- a/.github/workflows/integration_tests.sh +++ b/.github/workflows/integration_tests.sh @@ -47,7 +47,6 @@ if test "${BACKEND}" = "dnf"; then echo "gpgcheck=0" >>/etc/yum.repos.d/metwork.repo echo "enabled=1" >>/etc/yum.repos.d/metwork.repo echo "metadata_expire=0" >>/etc/yum.repos.d/metwork.repo - dnf -y install epel-release dnf -y install metwork-mfext-full metwork-mfext-layer-python3_scientific metwork-mfext-layer-python3_extratools metwork-mfext-layer-python3_mapserverapi metwork-mfext-layer-python3_ia metwork-mfext-layer-python3_radartools mkdir mfext mfextaddon_scientific mfextaddon_mapserver mfextaddon_python3_ia mfextaddon_radartools dnf -y install metwork-mfserv metwork-mfdata metwork-mfbase metwork-mfadmin metwork-mfsysmon From 49f8dc4e97eb77066026285cf7619c1f20c26c6f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste VESLIN <19856429+thebaptiste@users.noreply.github.com> Date: Thu, 12 Jun 2025 17:31:10 +0200 Subject: [PATCH 5/6] build: no epel-release on fedora --- .github/workflows/integration_tests.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/integration_tests.sh b/.github/workflows/integration_tests.sh index 4b2d5f9..9a7a4d9 100755 --- a/.github/workflows/integration_tests.sh +++ b/.github/workflows/integration_tests.sh @@ -47,7 +47,6 @@ if test "${BACKEND}" = "dnf"; then echo "gpgcheck=0" >>/etc/yum.repos.d/metwork.repo echo "enabled=1" >>/etc/yum.repos.d/metwork.repo echo "metadata_expire=0" >>/etc/yum.repos.d/metwork.repo - dnf -y install epel-release dnf -y install metwork-mfext-full metwork-mfext-layer-python3_scientific metwork-mfext-layer-python3_extratools metwork-mfext-layer-python3_mapserverapi metwork-mfext-layer-python3_ia metwork-mfext-layer-python3_radartools mkdir mfext mfextaddon_scientific mfextaddon_mapserver mfextaddon_python3_ia mfextaddon_radartools dnf -y install metwork-mfserv metwork-mfdata metwork-mfbase metwork-mfadmin metwork-mfsysmon From 00e16f0ffbc228b40ff535d5cf32cf817658bafa Mon Sep 17 00:00:00 2001 From: thebaptiste Date: Thu, 12 Jun 2025 15:36:45 +0000 Subject: [PATCH 6/6] build: epel-release only on rockylinux --- .github/workflows/ci.yml | 2 +- .github/workflows/integration_tests.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a2462e..c55d7a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ jobs: - name: install git rocky if: ${{ startsWith(matrix.container, 'rockylinux:') }} run: | - yum -y install git epel-release + yum -y install git - name: install git alma if: ${{ startsWith(matrix.container, 'almalinux:') }} run: | diff --git a/.github/workflows/integration_tests.sh b/.github/workflows/integration_tests.sh index 9a7a4d9..2743e48 100755 --- a/.github/workflows/integration_tests.sh +++ b/.github/workflows/integration_tests.sh @@ -47,6 +47,9 @@ if test "${BACKEND}" = "dnf"; then echo "gpgcheck=0" >>/etc/yum.repos.d/metwork.repo echo "enabled=1" >>/etc/yum.repos.d/metwork.repo echo "metadata_expire=0" >>/etc/yum.repos.d/metwork.repo + if test "${BASE}" = "rockylinux/rockylinux"; then + dnf -y install epel-release + fi dnf -y install metwork-mfext-full metwork-mfext-layer-python3_scientific metwork-mfext-layer-python3_extratools metwork-mfext-layer-python3_mapserverapi metwork-mfext-layer-python3_ia metwork-mfext-layer-python3_radartools mkdir mfext mfextaddon_scientific mfextaddon_mapserver mfextaddon_python3_ia mfextaddon_radartools dnf -y install metwork-mfserv metwork-mfdata metwork-mfbase metwork-mfadmin metwork-mfsysmon