fix

centreon · Jan 31, 2024 · 8b71208 · 8b71208
1 parent 61ea67e
commit 8b71208
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/lua-cffi.yml b/.github/workflows/lua-cffi.yml
@@ -64,7 +64,12 @@ jobs:
             dnf install -y make gcc gcc-c++ meson cmake libffi libffi-devel
           else
             apt-get update
-            apt-get install -y make gcc g++ meson cmake libffi7 libffi-dev
+            apt-get install -y make gcc g++ meson cmake libffi-dev
+            if [ "${{ matrix.distrib }}" = "bookworm" ]; then
+              apt-get install -y libffi8
+            else
+              apt-get install -y libffi7
+            fi
           fi
         shell: bash
 

diff --git a/.github/workflows/lua-curl.yml b/.github/workflows/lua-curl.yml
@@ -68,10 +68,10 @@ jobs:
       - name: Compile lua-curl and prepare packaging
         run: |
           if [ "${{ matrix.package_extension }}" == "rpm" ]; then
-            dnf install -y make cmake gcc openssl openssl-devel libcurl-devel python3-pip cpanminus
+            dnf install -y make cmake gcc openssl openssl-devel libcurl-devel pipx cpanminus
           else
             apt-get update
-            apt-get install -y make cmake gcc openssl libssl-dev libcurl4-openssl-dev python3-pip cpanminus liblua5.3-dev
+            apt-get install -y make cmake gcc openssl libssl-dev libcurl4-openssl-dev pipx cpanminus liblua5.3-dev
           fi
 
           cpanm -v \
@@ -84,7 +84,8 @@ jobs:
 
           cd lua-curl-src
 
-          pip3 install conan
+          pipx install conan
+          export PATH="$PATH:/root/.local/bin"
           conan profile detect
 
           cat <<'EOF' >> conanfile.txt

diff --git a/.github/workflows/stream-connectors.yml b/.github/workflows/stream-connectors.yml
@@ -46,9 +46,14 @@ jobs:
             echo "Adding $BASE_NAME to folders"
             folders+=($BASE_NAME)
           done
+          echo $folders
+          echo "!!!!"
           unique_folders=($(printf "%s\n" "${folders[@]}" | sort -u | tr '\n' ' '))
           echo $unique_folders
+          echo "!!!!"
+          echo $(jq --compact-output --null-input '$ARGS.positional' --args -- ${unique_folders[@]})
           echo "connectors=$(jq --compact-output --null-input '$ARGS.positional' --args -- ${unique_folders[@]})" >> $GITHUB_OUTPUT
+          exit 1
         shell: bash
 
   package: