Refactor: Improve CI/CD workflows and dependency management (#10)

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: clinchmtnmojo <clinchmtnmojo@gmail.com>

Author: 3 people

.github/workflows/build.yml

@@ -65,56 +65,87 @@ jobs:
         run: |
           brew update
           brew install ninja boost qt@5 miniupnpc qrencode icu4c
+          
+          # Set environment variables for Boost and ICU
           echo "BOOST_ROOT=$(brew --prefix boost)" >> $GITHUB_ENV
-          echo "ICU_ROOT=$(brew --prefix icu4c@77)" >> $GITHUB_ENV
-          echo "PATH=$(brew --prefix icu4c@77)/bin:$PATH" >> $GITHUB_ENV
-          echo "PKG_CONFIG_PATH=$(brew --prefix icu4c@77)/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
-          echo "LDFLAGS=-L$(brew --prefix icu4c@77)/lib" >> $GITHUB_ENV
-          echo "CPPFLAGS=-I$(brew --prefix icu4c@77)/include" >> $GITHUB_ENV
+          
+          # Try different ICU versions
+          if [ -d "$(brew --prefix)/opt/icu4c" ]; then
+            ICU_PREFIX="$(brew --prefix)/opt/icu4c"
+          elif [ -d "$(brew --prefix)/opt/icu4c@77" ]; then
+            ICU_PREFIX="$(brew --prefix)/opt/icu4c@77"
+          elif [ -d "$(brew --prefix)/opt/icu4c@76" ]; then
+            ICU_PREFIX="$(brew --prefix)/opt/icu4c@76"
+          else
+            ICU_PREFIX="$(brew --prefix icu4c)"
+          fi
+          
+          echo "ICU_ROOT=$ICU_PREFIX" >> $GITHUB_ENV
+          echo "PATH=$ICU_PREFIX/bin:$PATH" >> $GITHUB_ENV
+          echo "PKG_CONFIG_PATH=$ICU_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
+          echo "LDFLAGS=-L$ICU_PREFIX/lib" >> $GITHUB_ENV
+          echo "CPPFLAGS=-I$ICU_PREFIX/include" >> $GITHUB_ENV
 
       - name: Install dependencies (Windows)
         if: matrix.os == 'windows-2022'
         shell: pwsh
         run: |
-          choco install -y ninja vcpkg miniupnpc qrencode qt5-default
-          vcpkg install --triplet x64-windows boost-filesystem boost-thread boost-date-time `
-            boost-chrono boost-regex boost-serialization boost-program-options `
-            boost-multi-index boost-uuid boost-asio boost-scope-exit boost-format `
-            icu openssl
+          # Install basic tools
+          choco install -y ninja
+          
+          # Initialize vcpkg if not already done
+          if (-not (Test-Path "C:/vcpkg/vcpkg.exe")) {
+            git clone https://github.com/Microsoft/vcpkg.git C:/vcpkg
+            cd C:/vcpkg
+            .\bootstrap-vcpkg.bat
+            .\vcpkg integrate install
+          }
+          
+          # Install packages via vcpkg
+          C:/vcpkg/vcpkg.exe install --triplet x64-windows `
+            boost-filesystem boost-thread boost-date-time boost-chrono `
+            boost-regex boost-serialization boost-program-options `
+            boost-multi-index boost-uuid boost-asio boost-scope-exit `
+            boost-format icu openssl miniupnpc
 
       # -------------------- Configure & Build --------------------
       - name: Configure
         shell: bash
         run: |
           if [ "${{ matrix.os }}" = "macos-14" ]; then
-            export ICU_ROOT=$(brew --prefix icu4c@77)
+            # ICU_ROOT should be set from previous step
             export PATH="$ICU_ROOT/bin:$PATH"
             export PKG_CONFIG_PATH="$ICU_ROOT/lib/pkgconfig:$PKG_CONFIG_PATH"
             export LDFLAGS="-L$ICU_ROOT/lib $LDFLAGS"
             export CPPFLAGS="-I$ICU_ROOT/include $CPPFLAGS"
             
+            echo "Using ICU_ROOT: $ICU_ROOT"
+            echo "Available ICU libraries:"
+            ls -la "$ICU_ROOT/lib/" | grep -E "libicu.*\.(dylib|a)$" || echo "No ICU libraries found"
+            
             # Check for ICU library files and use versioned names if needed
             ICU_DATA_LIB=""
             ICU_I18N_LIB=""
             ICU_UC_LIB=""
             
-            if [ -f "$ICU_ROOT/lib/libicudata.77.dylib" ]; then
-              ICU_DATA_LIB="$ICU_ROOT/lib/libicudata.77.dylib"
-            elif [ -f "$ICU_ROOT/lib/libicudata.dylib" ]; then
-              ICU_DATA_LIB="$ICU_ROOT/lib/libicudata.dylib"
-            fi
-            
-            if [ -f "$ICU_ROOT/lib/libicui18n.77.dylib" ]; then
-              ICU_I18N_LIB="$ICU_ROOT/lib/libicui18n.77.dylib"
-            elif [ -f "$ICU_ROOT/lib/libicui18n.dylib" ]; then
-              ICU_I18N_LIB="$ICU_ROOT/lib/libicui18n.dylib"
-            fi
-            
-            if [ -f "$ICU_ROOT/lib/libicuuc.77.dylib" ]; then
-              ICU_UC_LIB="$ICU_ROOT/lib/libicuuc.77.dylib"
-            elif [ -f "$ICU_ROOT/lib/libicuuc.dylib" ]; then
-              ICU_UC_LIB="$ICU_ROOT/lib/libicuuc.dylib"
-            fi
+            # Try to find ICU libraries with different version patterns
+            for version in 77 76 75 74 ""; do
+              if [ -n "$version" ]; then
+                suffix=".$version.dylib"
+              else
+                suffix=".dylib"
+              fi
+              
+              if [ -z "$ICU_DATA_LIB" ] && [ -f "$ICU_ROOT/lib/libicudata$suffix" ]; then
+                ICU_DATA_LIB="$ICU_ROOT/lib/libicudata$suffix"
+              fi
+              if [ -z "$ICU_I18N_LIB" ] && [ -f "$ICU_ROOT/lib/libicui18n$suffix" ]; then
+                ICU_I18N_LIB="$ICU_ROOT/lib/libicui18n$suffix"
+              fi
+              if [ -z "$ICU_UC_LIB" ] && [ -f "$ICU_ROOT/lib/libicuuc$suffix" ]; then
+                ICU_UC_LIB="$ICU_ROOT/lib/libicuuc$suffix"
+              fi
+            done
             
             echo "ICU Data Library: $ICU_DATA_LIB"
             echo "ICU I18N Library: $ICU_I18N_LIB"
@@ -125,7 +156,7 @@ jobs:
               -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
               -DCMAKE_OSX_ARCHITECTURES=arm64 \
               -DBOOST_ROOT="$BOOST_ROOT" \
-              -DBUILD_TESTS=ON
+              -DBUILD_TESTS=ON \
               -DICU_ROOT="$ICU_ROOT" \
               -DICU_INCLUDE_DIR="$ICU_ROOT/include" \
               -DICU_DATA_LIBRARY="$ICU_DATA_LIB" \
@@ -148,7 +179,7 @@ jobs:
             cmake -S . -B build \
               -G Ninja \
               -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
-              -DBUILD_TESTS=ON
+              -DBUILD_TESTS=ON \
               -DCMAKE_POLICY_DEFAULT_CMP0167=OLD
           fi
 
@@ -158,11 +189,19 @@ jobs:
       # -------------------- Run Tests --------------------
       - name: Run tests
         if: success()
+        shell: bash
         run: |
-          if [ -f "build/CTestTestfile.cmake" ]; then
-            ctest --test-dir build --output-on-failure
+          cd build
+          if [ -f "CTestTestfile.cmake" ]; then
+            echo "Running tests..."
+            ctest --output-on-failure --verbose
+          elif [ -f "test/CTestTestfile.cmake" ]; then
+            echo "Running tests from test directory..."
+            ctest --test-dir test --output-on-failure --verbose
           else
             echo "No tests configured, skipping ctest"
+            echo "Available files in build directory:"
+            find . -name "CTestTestfile.cmake" -o -name "*test*" -type f | head -10
           fi
 
       # -------------------- Upload Artifacts --------------------

.github/workflows/check.yml.disabled .github/workflows/check-dev.yml.github/workflows/check.yml.disabled renamed to .github/workflows/check-dev.yml

@@ -32,12 +32,26 @@ jobs:
         uses: microsoft/setup-msbuild@v1.1
 
 
-      - name: Download and Install Boost 1.83
+      - name: Install dependencies (Windows)
+        shell: pwsh
         run: |
-          $Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe"
-          $OutputPath = "C:\\Users\\runneradmin\\AppData\\Local\\Temp\\boost-installer.exe"
-          curl -L $Url -o $OutputPath
-          Start-Process -Wait -FilePath $OutputPath "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=C:\\thirdparties\\boost-1.83.0"
+          # Install basic tools
+          choco install -y ninja
+          
+          # Initialize vcpkg if not already done
+          if (-not (Test-Path "C:/vcpkg/vcpkg.exe")) {
+            git clone https://github.com/Microsoft/vcpkg.git C:/vcpkg
+            cd C:/vcpkg
+            .\bootstrap-vcpkg.bat
+            .\vcpkg integrate install
+          }
+          
+          # Install packages via vcpkg
+          C:/vcpkg/vcpkg.exe install --triplet x64-windows `
+            boost-filesystem boost-thread boost-date-time boost-chrono `
+            boost-regex boost-serialization boost-program-options `
+            boost-multi-index boost-uuid boost-asio boost-scope-exit `
+            boost-format icu openssl miniupnpc
     
       - name: Build
         shell: powershell
@@ -49,19 +63,21 @@ jobs:
           $release_name = "fuego-cli-win64-v$xfg_ver"
           mkdir "$build_folder"
           cd "$build_folder"
-          cmake -G "Visual Studio 17 2022" -A x64 -DBOOST_ROOT="$env:BOOST_ROOT" -DBOOST_INCLUDE_DIRS="$env:BOOST_ROOT/include" ..
-          msbuild fuegoX.sln /p:Configuration=Release /m
-          cd src\Release
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release `
+                -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" `
+                -DCMAKE_POLICY_DEFAULT_CMP0167=OLD ..
+          cmake --build . --parallel
+          cd src
           Compress-Archive -Path *.exe -DestinationPath "$release_name.zip"
           $sha256 = (Get-FileHash "$release_name.zip").Hash
-          $asset_path = "./$build_folder/src/Release/$release_name.zip"
+          $asset_path = "./$build_folder/src/$release_name.zip"
           mkdir "$release_name"
           cp *.exe "$release_name/"
           echo "sha256=${sha256}" >> $env:GITHUB_OUTPUT
           echo "release_name=${release_name}.zip" >> $env:GITHUB_OUTPUT
           echo "asset_path=${asset_path}" >> $env:GITHUB_OUTPUT
           echo "xfg_version=${xfg_ver}" >> $env:GITHUB_OUTPUT
-          echo "artifact_path=$build_folder/src/Release/$release_name" >> $env:GITHUB_OUTPUT
+          echo "artifact_path=$build_folder/src/$release_name" >> $env:GITHUB_OUTPUT
 
       - name: Upload To GH Artifacts
         uses: actions/upload-artifact@v4
@@ -81,15 +97,18 @@ jobs:
         id: build
         run: |
           sudo apt-get update
-          sudo apt-get install -y libboost-all-dev
+          sudo apt-get install -y build-essential ninja-build pkg-config \
+               libssl-dev libminiupnpc-dev libqrencode-dev libudev-dev \
+               libunwind-dev liblzma-dev qtbase5-dev qtbase5-dev-tools \
+               libicu-dev libboost-all-dev
           build_folder="build/debug"
           xfg_ver=${GITHUB_SHA::7}
           xfg_ver_folder=$(echo $xfg_ver | sed 's/\.//g')
           release_name=fuego-cli-ubuntu-2204-dev"$xfg_ver"
           mkdir -p "$build_folder"
           cd "$build_folder"
-          cmake ../.. -DCMAKE_BUILD_TYPE=Debug
-          make -j4
+          cmake ../.. -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POLICY_DEFAULT_CMP0167=OLD
+          ninja -j$(nproc)
           mkdir -p "$release_name"
           exeFiles=()
           for f in src/*; do [[ -x $f && -f $f ]] && exeFiles+=( "$f" ); done
@@ -123,8 +142,8 @@ jobs:
           release_name=fuego-cli-ubuntu-2404-dev"$xfg_ver"
           mkdir -p "$build_folder"
           cd "$build_folder"
-          cmake ../.. -DCMAKE_BUILD_TYPE=Debug
-          make -j4
+          cmake ../.. -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POLICY_DEFAULT_CMP0167=OLD
+          ninja -j$(nproc)
           mkdir -p "$release_name"
           exeFiles=()
           for f in src/*; do [[ -x $f && -f $f ]] && exeFiles+=( "$f" ); done
@@ -167,19 +186,45 @@ jobs:
           xfg_ver=${GITHUB_SHA::7}
           release_name=fuego-cli-macos-${{ matrix.arch }}-dev"$xfg_ver"
 
-          brew install gcc boost ccache
+          brew update
+          brew install ninja boost qt@5 miniupnpc qrencode icu4c
+          
+          # Set environment variables for Boost and ICU
+          export BOOST_ROOT=$(brew --prefix boost)
+          
+          # Try different ICU versions
+          if [ -d "$(brew --prefix)/opt/icu4c" ]; then
+            ICU_PREFIX="$(brew --prefix)/opt/icu4c"
+          elif [ -d "$(brew --prefix)/opt/icu4c@77" ]; then
+            ICU_PREFIX="$(brew --prefix)/opt/icu4c@77"
+          elif [ -d "$(brew --prefix)/opt/icu4c@76" ]; then
+            ICU_PREFIX="$(brew --prefix)/opt/icu4c@76"
+          else
+            ICU_PREFIX="$(brew --prefix icu4c)"
+          fi
+          
+          export ICU_ROOT="$ICU_PREFIX"
+          export PATH="$ICU_PREFIX/bin:$PATH"
+          export PKG_CONFIG_PATH="$ICU_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
+          export LDFLAGS="-L$ICU_PREFIX/lib"
+          export CPPFLAGS="-I$ICU_PREFIX/include"
+          
           export CC=clang
           export CXX=clang++
-          export PATH="/usr/local/opt/ccache/libexec:$PATH"
 
           mkdir "$build_folder"
           cd "$build_folder"
           cmake .. \
+            -G Ninja \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch_flag }} \
+            -DBOOST_ROOT="$BOOST_ROOT" \
+            -DICU_ROOT="$ICU_ROOT" \
+            -DCMAKE_PREFIX_PATH="$ICU_ROOT" \
             -DCMAKE_C_FLAGS="-mmacosx-version-min=10.12" \
-            -DCMAKE_CXX_FLAGS="-mmacosx-version-min=10.12 -Wno-unknown-warning-option"
-          make -j2
+            -DCMAKE_CXX_FLAGS="-mmacosx-version-min=10.12 -Wno-unknown-warning-option" \
+            -DCMAKE_POLICY_DEFAULT_CMP0167=OLD
+          ninja -j$(sysctl -n hw.ncpu)
           mkdir "$release_name"
           exeFiles=()
           for f in src/*; do [[ -x $f && -f $f ]] && strip "$f" && exeFiles+=( "$f" ); done