fix

centreon · Jan 29, 2024 · aeeff02 · aeeff02
1 parent dde8f9a
commit aeeff02
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 26 deletions.
diff --git a/.github/docker/Dockerfile.packaging-alma8 b/.github/docker/Dockerfile.packaging-alma8
@@ -4,6 +4,9 @@ FROM ${REGISTRY_URL}/almalinux:8
 
 RUN bash -e <<EOF
 
+dnf install -y dnf-plugins-core epel-release
+dnf config-manager --set-enabled powertools
+
 echo '[goreleaser]
 name=GoReleaser
 baseurl=https://repo.goreleaser.com/yum/

diff --git a/.github/docker/Dockerfile.packaging-alma9 b/.github/docker/Dockerfile.packaging-alma9
@@ -4,6 +4,9 @@ FROM ${REGISTRY_URL}/almalinux:9
 
 RUN bash -e <<EOF
 
+dnf install -y dnf-plugins-core epel-release
+dnf config-manager --set-enabled crb
+
 echo '[goreleaser]
 name=GoReleaser
 baseurl=https://repo.goreleaser.com/yum/

diff --git a/.github/workflows/lua-cffi.yml b/.github/workflows/lua-cffi.yml
@@ -55,14 +55,6 @@ jobs:
       - name: Install dependencies
         run: |
           if  [ "${{ matrix.package_extension }}" = "rpm" ]; then
-            dnf install -y dnf-plugins-core epel-release
-
-            if  [ "${{ matrix.distrib }}" = "el9" ]; then
-              dnf config-manager --set-enabled crb
-            else
-              dnf config-manager --set-enabled powertools
-            fi
-
             dnf install -y make gcc luarocks meson gcc-c++ cmake libffi libffi-devel
           else
             apt-get update

diff --git a/.github/workflows/lua-curl.yml b/.github/workflows/lua-curl.yml
@@ -50,16 +50,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Install dependencies
-        run: |
-          dnf install -y dnf-plugins-core epel-release
-
-          if  [ "${{ matrix.distrib }}" = "el9" ]; then
-            dnf config-manager --set-enabled crb
-          else
-            dnf config-manager --set-enabled powertools
-          fi
-
-          dnf install -y make gcc luarocks meson gcc-c++ cmake libcurl-devel
+        run: dnf install -y make gcc luarocks meson gcc-c++ cmake libcurl-devel
         shell: bash
 
       - name: Checkout sources of lua-curl

diff --git a/.github/workflows/lua-tz.yml b/.github/workflows/lua-tz.yml
@@ -55,14 +55,6 @@ jobs:
       - name: Install dependencies
         run: |
           if  [ "${{ matrix.package_extension }}" = "rpm" ]; then
-            dnf install -y dnf-plugins-core epel-release
-
-            if  [ "${{ matrix.distrib }}" = "el9" ]; then
-              dnf config-manager --set-enabled crb
-            else
-              dnf config-manager --set-enabled powertools
-            fi
-
             dnf install -y make gcc luarocks meson gcc-c++ cmake perl
           else
             apt-get update