From 7706375197c318309fa4932af612256926f73b13 Mon Sep 17 00:00:00 2001
From: offa <bm-dev@yandex.com>
Date: Wed, 7 Aug 2024 17:40:16 +0200
Subject: [PATCH] Use Pipx on CI (#254) and replace broken Boost PPA

---
 .github/workflows/ci.yml         | 4 ++--
 .github/workflows/systemtest.yml | 4 ++--
 script/ci_setup.sh               | 9 +++++----
 script/ci_testdeploy.sh          | 1 +
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b1cec92..c42a221 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,9 +30,9 @@ jobs:
       - name: Install Boost
         if: ${{ matrix.boost == true }}
         run: |
-          add-apt-repository ppa:nicola-onorata/toolchain
+          add-apt-repository ppa:mhier/libboost-latest
           apt-get update
-          apt-get install -y boost1.81
+          apt-get install -y boost1.83
       - name: Build
         run: script/ci_build.sh -DINFLUXCXX_WITH_BOOST=${{ matrix.boost }}
       - name: Check deployment as cmake subdirectory
diff --git a/.github/workflows/systemtest.yml b/.github/workflows/systemtest.yml
index b856358..16a4764 100644
--- a/.github/workflows/systemtest.yml
+++ b/.github/workflows/systemtest.yml
@@ -36,9 +36,9 @@ jobs:
       - name: Setup
         run: |
           script/ci_setup.sh
-          add-apt-repository ppa:nicola-onorata/toolchain
+          add-apt-repository ppa:mhier/libboost-latest
           apt-get update
-          apt-get install -y boost1.81
+          apt-get install -y boost1.83
       - name: Build
         run: |
           cmake --preset conan-release
diff --git a/script/ci_setup.sh b/script/ci_setup.sh
index ce423bb..d3ac506 100755
--- a/script/ci_setup.sh
+++ b/script/ci_setup.sh
@@ -2,14 +2,15 @@
 
 set -ex
 
+export DEBIAN_FRONTEND=noninteractive
+export PATH=$HOME/.local/bin:$PATH
 apt-get update
-apt-get install -y python3-pip libssl-dev libcurl4-openssl-dev
-pip3 install -U conan
+apt-get install -y pipx
+pipx install conan
+conan profile detect
 
 mkdir -p build && cd build
 
-conan profile detect
-
 if [[ "${CXX}" == clang* ]]
 then
     STDLIB_ENV="CXXFLAGS=\"-stdlib=libc++\""
diff --git a/script/ci_testdeploy.sh b/script/ci_testdeploy.sh
index 6e492a2..1b2e1ee 100755
--- a/script/ci_testdeploy.sh
+++ b/script/ci_testdeploy.sh
@@ -5,6 +5,7 @@ set -ex
 PID=$$
 BASEPATH=/tmp/influx-test-${PID}
 BUILD_TYPE="Release"
+export PATH=$HOME/.local/bin:$PATH
 
 echo "perform deployment test in ${BASEPATH}"
 mkdir -p ${BASEPATH}/influxdb-cxx