fix

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

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/.github/docker/Dockerfile.packaging-alma8 b/.github/docker/Dockerfile.packaging-alma8
@@ -10,7 +10,7 @@ baseurl=https://repo.goreleaser.com/yum/
 enabled=1
 gpgcheck=0' | tee /etc/yum.repos.d/goreleaser.repo
 
-dnf install -y git rpm-build rpm-sign zstd nfpm lua
+dnf install -y git rpm-build rpm-sign zstd nfpm lua lua-devel
 dnf clean all
 
 EOF
diff --git a/.github/docker/Dockerfile.packaging-alma9 b/.github/docker/Dockerfile.packaging-alma9
@@ -10,7 +10,7 @@ baseurl=https://repo.goreleaser.com/yum/
 enabled=1
 gpgcheck=0' | tee /etc/yum.repos.d/goreleaser.repo
 
-dnf install -y git rpm-build rpm-sign zstd nfpm lua
+dnf install -y git rpm-build rpm-sign zstd nfpm lua lua-devel
 dnf clean all
 
 EOF
diff --git a/.github/docker/Dockerfile.packaging-bullseye b/.github/docker/Dockerfile.packaging-bullseye
@@ -5,7 +5,7 @@ FROM ${REGISTRY_URL}/debian:bullseye
 RUN bash -e <<EOF
 
 apt-get update
-apt-get install -y git debmake pbuilder aptitude zstd ca-certificates lua5.4
+apt-get install -y git debmake pbuilder aptitude zstd ca-certificates lua5.4 liblua5.4-dev
 
 echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list
 

diff --git a/.github/workflows/lua-cffi.yml b/.github/workflows/lua-cffi.yml
@@ -63,10 +63,10 @@ jobs:
               dnf config-manager --set-enabled powertools
             fi
 
-            dnf install -y make gcc luarocks meson gcc-c++ cmake libffi libffi-devel lua-devel
+            dnf install -y make gcc luarocks meson gcc-c++ cmake libffi libffi-devel
           else
             apt-get update
-            apt-get install -y make gcc luarocks meson cmake libffi7 libffi-dev lua5.4 liblua5.4-dev
+            apt-get install -y make gcc luarocks meson cmake libffi7 libffi-dev
           fi
         shell: bash
 

diff --git a/.github/workflows/lua-curl.yml b/.github/workflows/lua-curl.yml
@@ -59,7 +59,7 @@ jobs:
             dnf config-manager --set-enabled powertools
           fi
 
-          dnf install -y make gcc luarocks meson gcc-c++ cmake lua-devel libcurl-devel
+          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
@@ -63,10 +63,10 @@ jobs:
               dnf config-manager --set-enabled powertools
             fi
 
-            dnf install -y make gcc luarocks meson gcc-c++ cmake lua-devel perl
+            dnf install -y make gcc luarocks meson gcc-c++ cmake perl
           else
             apt-get update
-            apt-get install -y make gcc luarocks meson cmake lua5.3 liblua5.3-dev perl
+            apt-get install -y make gcc luarocks meson cmake perl
           fi
         shell: bash
 

diff --git a/dependencies/lua-cffi/packaging/lua-cffi.yaml b/dependencies/lua-cffi/packaging/lua-cffi.yaml
@@ -18,6 +18,10 @@ contents:
   - src: "../lua-cffi/cffi.so"
     dst: "/usr/lib64/lua/@luaver@/cffi.so"
 
+  - src: "../lua-cffi/cffi.so"
+    dst: "/usr/lib64/lua/5.3/cffi.so"
+    packager: deb
+
 overrides:
   rpm:
     depends: