Simplify CI workflow and remove unnecessary freetds dependency

- Remove freetds-dev build dependency (not needed - MSSQL uses ODBC only)
- Consolidate workflow from 268 to 224 lines (-44 lines)
- Update build scripts to handle dependency installation
- Keep test scripts separate for clarity

Author: lovasoa

.github/workflows/packages.yml

@@ -25,7 +25,7 @@ permissions:
 jobs:
   build-deb:
     name: Build Debian Package
-    runs-on: ubuntu-20.04  # Use older Ubuntu for wider glibc compatibility
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -34,17 +34,8 @@ jobs:
       - name: Install build dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y \
-            debhelper \
-            dh-make \
-            devscripts \
-            lintian \
-            dpkg-dev \
-            build-essential \
-            unixodbc-dev \
-            freetds-dev \
-            libssl-dev \
-            pkg-config
+          sudo apt-get install -y debhelper dpkg-dev build-essential \
+            libssl-dev pkg-config unixodbc-dev lintian
       
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
@@ -54,29 +45,18 @@ jobs:
       - name: Set up cargo cache
         uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
 
-      - name: Build Debian package
+      - name: Build package
         run: |
-          # Update changelog with current version
           VERSION=$(grep '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
           sed -i "1s/.*/sqlpage ($VERSION-1) unstable; urgency=medium/" debian/changelog
-          
-          # Build package (use -d to bypass build dependency checks since Rust is provided by CI)
           dpkg-buildpackage -us -uc -b -d
-      
-      - name: Collect build artifacts
-        run: |
+          
           mkdir -p build-output
-          mv ../*.deb build-output/ || true
+          mv ../*.deb build-output/
           mv ../*.changes build-output/ || true
           mv ../*.buildinfo build-output/ || true
-          ls -lh build-output/
-      
-      - name: Run lintian checks
-        run: |
+          
           lintian --no-tag-display-limit build-output/*.deb || true
-      
-      - name: List package contents
-        run: |
           dpkg-deb --contents build-output/*.deb
           dpkg-deb --info build-output/*.deb
       
@@ -97,7 +77,7 @@ jobs:
   build-rpm:
     name: Build RPM Package
     runs-on: ubuntu-latest
-    container: quay.io/pypa/manylinux_2_28_x86_64  # Maximum glibc compatibility (glibc 2.28)
+    container: quay.io/pypa/manylinux_2_28_x86_64
     steps:
       - name: Install git for checkout
         run: yum install -y git
@@ -110,15 +90,7 @@ jobs:
         run: git config --global --add safe.directory /__w/SQLPage/SQLPage
 
       - name: Install build dependencies
-        run: |
-          yum update -y
-          yum install -y \
-            rpm-build \
-            rpmdevtools \
-            openssl-devel \
-            systemd \
-            unixODBC-devel \
-            freetds-devel
+        run: yum install -y rpm-build rpmdevtools openssl-devel systemd unixODBC-devel
 
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
@@ -128,37 +100,22 @@ jobs:
       - name: Set up cargo cache
         uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
 
-      - name: Set up RPM build tree
-        run: rpmdev-setuptree
-      
-      - name: Update spec file version
+      - name: Build package
         run: |
+          rpmdev-setuptree
           VERSION=$(grep '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
-          # RPM doesn't allow hyphens in Version field, convert to tilde for pre-releases
           RPM_VERSION=$(echo "$VERSION" | sed 's/-/~/')
+          
           sed -i "s/^Version:.*/Version:        ${RPM_VERSION}/" rpm/sqlpage.spec
           cp rpm/sqlpage.spec ~/rpmbuild/SPECS/
-      
-      - name: Create source tarball
-        run: |
-          VERSION=$(grep '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
-          RPM_VERSION=$(echo "$VERSION" | sed 's/-/~/')
-          # Create tarball with version prefix matching spec file Source0
+          
           git archive --format=tar.gz --prefix="SQLPage-${RPM_VERSION}/" \
             -o ~/rpmbuild/SOURCES/v${RPM_VERSION}.tar.gz HEAD
-      
-      - name: Build RPM package
-        run: |
-          # Use --nodeps to bypass build dependency checks since Rust is provided by CI
+          
           rpmbuild -ba --nodeps ~/rpmbuild/SPECS/sqlpage.spec
-      
-      - name: Run rpmlint checks
-        run: |
+          
           rpmlint ~/rpmbuild/RPMS/*/sqlpage*.rpm || true
           rpmlint ~/rpmbuild/SRPMS/sqlpage*.rpm || true
-      
-      - name: List package contents
-        run: |
           rpm -qilp ~/rpmbuild/RPMS/*/sqlpage*.rpm
       
       - name: Upload RPM package

debian/control

@@ -8,8 +8,7 @@ Build-Depends: debhelper-compat (= 13),
                rustc (>= 1.70),
                libssl-dev,
                pkg-config,
-               unixodbc-dev,
-               freetds-dev
+               unixodbc-dev
 Standards-Version: 4.6.2
 Homepage: https://sql-page.com
 Vcs-Browser: https://github.com/sqlpage/SQLPage

rpm/sqlpage.spec

@@ -19,7 +19,6 @@ BuildRequires:  cargo >= 1.70
 BuildRequires:  openssl-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  unixODBC-devel
-BuildRequires:  freetds-devel
 
 Requires:       unixODBC
 Recommends:     sqlite

scripts/build-deb.sh

@@ -1,17 +1,13 @@
 #!/bin/bash
 set -euo pipefail
 
-# Build Debian package for SQLPage
-# This script builds a .deb package following Debian best practices
-
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 
-# Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
+NC='\033[0m'
 
 log_info() {
     echo -e "${GREEN}[INFO]${NC} $1"
@@ -25,45 +21,45 @@ log_error() {
     echo -e "${RED}[ERROR]${NC} $1"
 }
 
-# Check if we're on a Debian-based system
-if ! command -v dpkg-buildpackage &> /dev/null; then
-    log_error "dpkg-buildpackage not found. Install it with: apt-get install dpkg-dev"
-    exit 1
-fi
+cd "$PROJECT_ROOT"
 
-# Check for required tools
-MISSING_DEPS=()
-if ! command -v debhelper &> /dev/null; then
-    MISSING_DEPS+=("debhelper")
-fi
-if ! command -v cargo &> /dev/null; then
-    MISSING_DEPS+=("cargo")
+log_info "Installing build dependencies..."
+if command -v apt-get &> /dev/null; then
+    sudo apt-get update -qq
+    sudo apt-get install -y \
+        debhelper \
+        dpkg-dev \
+        build-essential \
+        libssl-dev \
+        pkg-config \
+        unixodbc-dev \
+        lintian
 fi
 
-if [ ${#MISSING_DEPS[@]} -gt 0 ]; then
-    log_error "Missing dependencies: ${MISSING_DEPS[*]}"
-    log_info "Install them with: apt-get install ${MISSING_DEPS[*]}"
+if ! command -v cargo &> /dev/null; then
+    log_error "Rust/Cargo not found. Install from https://rustup.rs"
     exit 1
 fi
 
-cd "$PROJECT_ROOT"
-
-log_info "Cleaning previous builds..."
-rm -rf debian/.debhelper debian/sqlpage debian/cargo_home
-cargo clean || true
+log_info "Updating changelog with current version..."
+VERSION=$(grep '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
+sed -i "1s/.*/sqlpage ($VERSION-1) unstable; urgency=medium/" debian/changelog
 
 log_info "Building Debian package..."
-dpkg-buildpackage -us -uc -b
+dpkg-buildpackage -us -uc -b -d
 
-log_info "Package built successfully!"
-log_info "Output files:"
-ls -lh ../*.deb || true
+log_info "Collecting build artifacts..."
+mkdir -p build-output
+mv ../*.deb build-output/ 2>/dev/null || true
+mv ../*.changes build-output/ 2>/dev/null || true
+mv ../*.buildinfo build-output/ 2>/dev/null || true
 
-# Run lintian if available
-if command -v lintian &> /dev/null; then
-    log_info "Running lintian checks..."
-    lintian ../*.deb || log_warn "Some lintian checks failed (this may be acceptable)"
-fi
+log_info "Running lintian checks..."
+lintian --no-tag-display-limit build-output/*.deb || log_warn "Some lintian checks failed"
+
+log_info "Package contents:"
+dpkg-deb --contents build-output/*.deb
+dpkg-deb --info build-output/*.deb
 
-log_info "Done! Package is ready at:"
-readlink -f ../*.deb || true
+log_info "Done! Package ready at:"
+ls -lh build-output/*.deb

scripts/build-rpm.sh

@@ -1,17 +1,13 @@
 #!/bin/bash
 set -euo pipefail
 
-# Build RPM package for SQLPage
-# This script builds an .rpm package following RPM best practices
-
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 
-# Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
+NC='\033[0m'
 
 log_info() {
     echo -e "${GREEN}[INFO]${NC} $1"
@@ -25,60 +21,44 @@ log_error() {
     echo -e "${RED}[ERROR]${NC} $1"
 }
 
-# Check if we're on an RPM-based system
-if ! command -v rpmbuild &> /dev/null; then
-    log_error "rpmbuild not found. Install it with: yum install rpm-build or dnf install rpm-build"
-    exit 1
-fi
+cd "$PROJECT_ROOT"
 
-# Check for required tools
-MISSING_DEPS=()
-if ! command -v cargo &> /dev/null; then
-    MISSING_DEPS+=("cargo")
-fi
-if ! command -v rpmdev-setuptree &> /dev/null; then
-    MISSING_DEPS+=("rpmdevtools")
+log_info "Installing build dependencies..."
+if command -v dnf &> /dev/null; then
+    sudo dnf install -y rpm-build rpmdevtools openssl-devel systemd unixODBC-devel
+elif command -v yum &> /dev/null; then
+    sudo yum install -y rpm-build rpmdevtools openssl-devel systemd unixODBC-devel
 fi
 
-if [ ${#MISSING_DEPS[@]} -gt 0 ]; then
-    log_error "Missing dependencies: ${MISSING_DEPS[*]}"
-    log_info "Install them with: yum install ${MISSING_DEPS[*]} or dnf install ${MISSING_DEPS[*]}"
+if ! command -v cargo &> /dev/null; then
+    log_error "Rust/Cargo not found. Install from https://rustup.rs"
     exit 1
 fi
 
-cd "$PROJECT_ROOT"
-
-# Setup RPM build tree
 log_info "Setting up RPM build tree..."
 rpmdev-setuptree
 
-# Get version from Cargo.toml
 VERSION=$(grep '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
-log_info "Building RPM for version $VERSION"
+RPM_VERSION=$(echo "$VERSION" | sed 's/-/~/')
+log_info "Building RPM for version $VERSION (RPM: $RPM_VERSION)"
 
-# Copy spec file
-log_info "Copying spec file..."
+log_info "Updating spec file version..."
+sed -i "s/^Version:.*/Version:        ${RPM_VERSION}/" rpm/sqlpage.spec
 cp rpm/sqlpage.spec ~/rpmbuild/SPECS/
 
-# Create source tarball
 log_info "Creating source tarball..."
-TARBALL="sqlpage-${VERSION}.tar.gz"
-git archive --format=tar.gz --prefix="SQLPage-${VERSION}/" -o ~/rpmbuild/SOURCES/"$TARBALL" HEAD
+git archive --format=tar.gz --prefix="SQLPage-${RPM_VERSION}/" \
+    -o ~/rpmbuild/SOURCES/v${RPM_VERSION}.tar.gz HEAD
 
-# Build the RPM
 log_info "Building RPM package..."
-rpmbuild -ba ~/rpmbuild/SPECS/sqlpage.spec
+rpmbuild -ba --nodeps ~/rpmbuild/SPECS/sqlpage.spec
 
-log_info "Package built successfully!"
-log_info "Output files:"
-find ~/rpmbuild/RPMS -name "sqlpage*.rpm" -exec ls -lh {} \;
-find ~/rpmbuild/SRPMS -name "sqlpage*.rpm" -exec ls -lh {} \;
+log_info "Running rpmlint checks..."
+rpmlint ~/rpmbuild/RPMS/*/sqlpage*.rpm || log_warn "Some rpmlint checks failed"
+rpmlint ~/rpmbuild/SRPMS/sqlpage*.rpm || true
 
-# Run rpmlint if available
-if command -v rpmlint &> /dev/null; then
-    log_info "Running rpmlint checks..."
-    rpmlint ~/rpmbuild/RPMS/*/sqlpage*.rpm || log_warn "Some rpmlint checks failed (this may be acceptable)"
-fi
+log_info "Package contents:"
+rpm -qilp ~/rpmbuild/RPMS/*/sqlpage*.rpm
 
-log_info "Done! Packages are ready at:"
-find ~/rpmbuild/RPMS -name "sqlpage*.rpm" -o -path ~/rpmbuild/SRPMS -name "sqlpage*.rpm"
+log_info "Done! Packages ready at:"
+find ~/rpmbuild/RPMS ~/rpmbuild/SRPMS -name "sqlpage*.rpm" -exec ls -lh {} \;