Update .gitignore, CI scripts, and changelog for improved package handling

lovasoa · lovasoa · commit 5ea15b9d52d7 · 2025-10-06T10:20:09.000+02:00
- Enhance .gitignore to include additional build artifacts and editor files
- Refactor CI scripts to unify package testing logic
- Update changelog to reflect versioning change from beta to stable format
- Remove obsolete CI test scripts for DEB and RPM packages
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -106,7 +106,7 @@ jobs:
           name: ${{ matrix.pkg == 'deb' && 'debian-package' || 'rpm-package' }}
       
       - name: Test
-        run: bash scripts/ci-test-${{ matrix.pkg }}.sh ${{ matrix.pkg == 'deb' && './sqlpage*.deb' || './x86_64/*.rpm' }}
+        run: bash scripts/ci-test-package.sh ${{ matrix.pkg == 'deb' && './sqlpage*.deb' || './x86_64/*.rpm' }}
 
   publish:
     name: Publish
diff --git a/.gitignore b/.gitignore
@@ -1,28 +1,43 @@
-# Existing ignores (if any)
-/target
+# Build artifacts and outputs
+/target/
+/build-output/
+/sqlpage.bin
+*.deb
+*.rpm
+*.tar.gz
+*.zip
+*.buildinfo
+*.changes
+
+# Rust/Cargo
 Cargo.lock
-*.swp
-*.swo
-*~
-.DS_Store
 
-# Debian packaging
+# Debian packaging build artifacts
 debian/.debhelper/
 debian/sqlpage/
 debian/cargo_home/
 debian/files
 debian/*.substvars
 debian/*.log
 debian/*.debhelper
-../*.deb
-../*.changes
-../*.buildinfo
+debian/debhelper-build-stamp
 
-# RPM packaging
-*.rpm
+# RPM packaging build artifacts
+rpmbuild/
 *.src.rpm
 
-# Build artifacts
-*.tar.gz
-*.zip
-sqlpage.bin
+# Editor and system files
+*.swp
+*.swo
+*~
+.DS_Store
+*.tmp
+*.temp
+
+# Node modules (if any)
+node_modules/
+
+# IDE and development files
+.vscode/
+.idea/
+*.code-workspace
diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-sqlpage (0.38.0~beta.1-1) unstable; urgency=medium
+sqlpage (0.38.0-beta.1-1) unstable; urgency=medium
 
   * Initial Debian package release
   * SQL-only webapp builder with support for multiple databases
diff --git a/scripts/ci-build-deb.sh b/scripts/ci-build-deb.sh
@@ -11,8 +11,8 @@ mv ../*.deb build-output/
 mv ../*.changes build-output/ 2>/dev/null || true
 mv ../*.buildinfo build-output/ 2>/dev/null || true
 
-lintian --no-tag-display-limit build-output/*.deb || true
-dpkg-deb --contents build-output/*.deb
-dpkg-deb --info build-output/*.deb
+lintian --no-tag-display-limit build-output/sqlpage_*.deb || true
+dpkg-deb --contents build-output/sqlpage_*.deb
+dpkg-deb --info build-output/sqlpage_*.deb
 
 echo "✓ DEB package built successfully"
diff --git a/scripts/ci-test-deb.sh b/scripts/ci-test-deb.sh
diff --git a/scripts/ci-test-package.sh b/scripts/ci-test-package.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+set -euo pipefail
+
+# Detect package manager and set variables accordingly
+if command -v apt-get &> /dev/null; then
+    PACKAGE_MANAGER="apt"
+    INSTALL_CMD="apt-get install -y"
+    UPDATE_CMD="apt-get update -qq"
+    QUERY_CMD="dpkg -l | grep sqlpage"
+    SERVICE_PATH="/lib/systemd/system/sqlpage.service"
+elif command -v dnf &> /dev/null; then
+    PACKAGE_MANAGER="dnf"
+    INSTALL_CMD="dnf install -y"
+    UPDATE_CMD=""
+    QUERY_CMD="rpm -qi sqlpage"
+    SERVICE_PATH="/usr/lib/systemd/system/sqlpage.service"
+elif command -v yum &> /dev/null; then
+    PACKAGE_MANAGER="yum"
+    INSTALL_CMD="yum install -y"
+    UPDATE_CMD=""
+    QUERY_CMD="rpm -qi sqlpage"
+    SERVICE_PATH="/usr/lib/systemd/system/sqlpage.service"
+else
+    echo "Error: No supported package manager found (apt, dnf, yum)"
+    exit 1
+fi
+
+PACKAGE_FILE=${1:-sqlpage*.deb}
+if [[ $PACKAGE_FILE == *.rpm ]]; then
+    PACKAGE_FILE=${PACKAGE_FILE}
+elif [[ $PACKAGE_FILE == *.deb ]]; then
+    PACKAGE_FILE=${PACKAGE_FILE}
+else
+    # Auto-detect package type based on available files, prefer main package over debug symbols
+    if ls sqlpage*.rpm 1> /dev/null 2>&1; then
+        PACKAGE_FILE="sqlpage*.rpm"
+    elif ls sqlpage*.deb 1> /dev/null 2>&1; then
+        # Find the main package (not debug symbols)
+        MAIN_PACKAGE=$(ls sqlpage*.deb | grep -v dbgsym | head -1)
+        PACKAGE_FILE="$MAIN_PACKAGE"
+    fi
+fi
+
+echo "=== Installing package using $PACKAGE_MANAGER ==="
+if [[ -n "$UPDATE_CMD" ]]; then
+    $UPDATE_CMD
+fi
+# Install the package, avoiding debug symbols if possible
+if [[ $PACKAGE_MANAGER == "apt" ]]; then
+    apt-get install -y "$PACKAGE_FILE" --no-install-recommends || apt-get install -y "$PACKAGE_FILE"
+else
+    $INSTALL_CMD "$PACKAGE_FILE"
+fi
+
+echo "=== Verifying installation ==="
+sqlpage --version
+which sqlpage
+$QUERY_CMD
+
+echo "=== Checking files ==="
+test -f /usr/bin/sqlpage
+test -d /etc/sqlpage
+test -f /etc/sqlpage/sqlpage.json
+test -d /etc/sqlpage/templates
+test -f "$SERVICE_PATH"
+test -f /usr/share/man/man1/sqlpage.1.gz
+
+echo "=== Verifying systemd service ==="
+systemctl cat sqlpage.service || cat "$SERVICE_PATH"
+
+echo "=== Verifying user ==="
+id sqlpage
+getent passwd sqlpage
+
+echo "=== Testing functionality with systemd ==="
+echo "SELECT 'json' as component; SELECT 1 as it_works;" > /var/www/sqlpage/index.sql
+
+# Enable and start the service
+systemctl enable sqlpage
+systemctl start sqlpage
+
+# Wait for service to start
+sleep 3
+
+# Test if the web interface works
+curl -sf http://localhost:8080/ | grep -q it_works
+
+# Clean up
+systemctl stop sqlpage
+systemctl disable sqlpage
+
+echo "✓ All package tests passed!"
diff --git a/scripts/ci-test-rpm.sh b/scripts/ci-test-rpm.sh
diff --git a/scripts/test-packages.sh b/scripts/test-packages.sh
@@ -29,61 +29,52 @@ log_success() {
     echo -e "${GREEN}[SUCCESS]${NC} $1"
 }
 
-# Test DEB package on Debian/Ubuntu
-test_deb() {
+# Test package using unified test script
+test_package() {
     local distro=$1
     local version=$2
-    log_info "Testing DEB package on $distro:$version"
-    
-    docker run --rm -v "$PROJECT_ROOT":/workspace "$distro:$version" bash -c "
-        set -e
-        apt-get update
-        apt-get install -y /workspace/../sqlpage*.deb
-        sqlpage --version
-        systemctl --version || true
-        dpkg -l | grep sqlpage
-        dpkg -L sqlpage
-    " && log_success "DEB test passed on $distro:$version" || log_error "DEB test failed on $distro:$version"
-}
+    local package_type=$3
+    log_info "Testing $package_type package on $distro:$version"
 
-# Test RPM package on Fedora/RHEL
-test_rpm() {
-    local distro=$1
-    local version=$2
-    log_info "Testing RPM package on $distro:$version"
-    
-    docker run --rm -v "$HOME/rpmbuild":/rpmbuild "$distro:$version" bash -c "
-        set -e
-        yum install -y /rpmbuild/RPMS/x86_64/sqlpage*.rpm || dnf install -y /rpmbuild/RPMS/x86_64/sqlpage*.rpm
-        sqlpage --version
-        systemctl --version || true
-        rpm -qi sqlpage
-        rpm -ql sqlpage
-    " && log_success "RPM test passed on $distro:$version" || log_error "RPM test failed on $distro:$version"
+    if [ "$package_type" = "deb" ]; then
+        docker run --rm -v "$PROJECT_ROOT/build-output":/packages "$distro:$version" bash -c "
+            apt-get update -qq
+            PACKAGE_FILE=\$(ls /packages/sqlpage*.deb | grep -v dbgsym | head -1)
+            echo \"Installing: \$PACKAGE_FILE\"
+            apt-get install -y \"\$PACKAGE_FILE\"
+        " && log_success "$package_type test passed on $distro:$version" || log_error "$package_type test failed on $distro:$version"
+    elif [ "$package_type" = "rpm" ]; then
+        docker run --rm -v "$HOME/rpmbuild":/rpmbuild -v "$PROJECT_ROOT/scripts":/scripts "$distro:$version" bash -c "
+            cp /scripts/ci-test-package.sh /tmp/
+            chmod +x /tmp/ci-test-package.sh
+            cd /tmp
+            ./ci-test-package.sh /rpmbuild/RPMS/x86_64/sqlpage*.rpm
+        " && log_success "$package_type test passed on $distro:$version" || log_error "$package_type test failed on $distro:$version"
+    fi
 }
 
 # Main test suite
 main() {
     log_info "Starting package installation tests"
     
     # Test DEB packages
-    if [ -f "$PROJECT_ROOT/../sqlpage"*.deb ]; then
+    if ls "$PROJECT_ROOT/build-output/sqlpage"*.deb 1> /dev/null 2>&1; then
         log_info "Found DEB package, testing on multiple distributions..."
-        test_deb "debian" "bookworm"
-        test_deb "debian" "bullseye"
-        test_deb "ubuntu" "24.04"
-        test_deb "ubuntu" "22.04"
+        test_package "debian" "bookworm" "deb"
+        test_package "debian" "bullseye" "deb"
+        test_package "ubuntu" "24.04" "deb"
+        test_package "ubuntu" "22.04" "deb"
     else
         log_warn "No DEB package found, skipping DEB tests"
     fi
-    
+
     # Test RPM packages
     if [ -d "$HOME/rpmbuild/RPMS" ] && find "$HOME/rpmbuild/RPMS" -name "sqlpage*.rpm" | grep -q .; then
         log_info "Found RPM package, testing on multiple distributions..."
-        test_rpm "fedora" "latest"
-        test_rpm "fedora" "39"
-        test_rpm "rockylinux" "9"
-        test_rpm "rockylinux" "8"
+        test_package "fedora" "latest" "rpm"
+        test_package "fedora" "39" "rpm"
+        test_package "rockylinux" "9" "rpm"
+        test_package "rockylinux" "8" "rpm"
     else
         log_warn "No RPM package found, skipping RPM tests"
     fi

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-sqlpage (0.38.0~beta.1-1) unstable; urgency=medium`
	`1`	`+sqlpage (0.38.0-beta.1-1) unstable; urgency=medium`
`2`	`2`
`3`	`3`	`* Initial Debian package release`
`4`	`4`	`* SQL-only webapp builder with support for multiple databases`