1

Author: dkropachev

.github/workflows/build-cpack-packages.yml

@@ -47,29 +47,24 @@ jobs:
       - name: Build packages
         run: make build-package
 
-      - name: Install driver dev package (DEB)
-        run: make -C packaging/smoke-test-app install-driver-dev-deb
+      - name: Install driver dev package
+        run: make -C packaging/smoke-test-app install-driver-dev
 
-      - name: Build smoke-test application package (DEB)
+      - name: Build smoke-test application package
         run: make -C packaging/smoke-test-app package
 
-      - name: Install driver dev package (DEB)
-        run: make -C packaging/smoke-test-app install-driver-dev-deb
-
-      - name: Install smoke-test application package (DEB)
-        run: make -C packaging/smoke-test-app install-app-deb
+      - name: Install smoke-test application package
+        run: make -C packaging/smoke-test-app install-app
 
-      - name: Run smoke-test application against local Scylla
-        run: make -C packaging/smoke-test-app test-package
+      - name: Test smoke-test application
+        run: make -C packaging/smoke-test-app test-app-package
 
       - name: Collect artifacts
         run: |
           set -euo pipefail
           shopt -s nullglob
           mkdir -p artifacts/linux
-          for file in build/*.deb build/*.rpm \
-                      packaging/smoke-test-app/build/*.deb \
-                      packaging/smoke-test-app/build/*.rpm; do
+          for file in build/*.deb build/*.rpm; do
             cp "$file" artifacts/linux/
           done
 
@@ -89,47 +84,17 @@ jobs:
       - name: Build packages
         run: make build-package
 
-      - name: Build smoke-test application package
-        run: make -C packaging/smoke-test-app package BUILD_TYPE=${{ inputs.build-type }}
-
-      - name: Install driver packages (pkg)
-        run: |
-          set -euo pipefail
-          shopt -s nullglob
-          packages=(build/*.pkg)
-          if [ "${#packages[@]}" -eq 0 ]; then
-            echo "No driver pkg packages produced"
-            exit 1
-          fi
-          echo "Installing ${#packages[@]} pkg package(s):"
-          for pkg in "${packages[@]}"; do
-            echo "  - $(basename "$pkg")"
-          done
-          # Install all packages (macOS productbuild creates a single package with components)
-          for pkg in "${packages[@]}"; do
-            sudo installer -pkg "$pkg" -target /
-          done
+      - name: Install driver dev package
+        run: make -C packaging/smoke-test-app install-driver-dev
 
-      - name: Verify dev package installation
-        run: |
-          set -euo pipefail
-          # Verify headers are installed
-          if [ ! -f /usr/local/include/cassandra.h ]; then
-            echo "ERROR: cassandra.h header not found - dev package may not be installed"
-            exit 1
-          fi
-          # Verify pkg-config file is installed
-          if ! PKG_CONFIG_PATH=/usr/local/lib/pkgconfig pkg-config --exists scylla-cpp-driver; then
-            echo "ERROR: scylla-cpp-driver.pc not found - dev package may not be installed"
-            exit 1
-          fi
-          echo "Dev package verification successful"
+      - name: Build smoke-test application package
+        run: make -C packaging/smoke-test-app package
 
-      - name: Install smoke-test application package (pkg)
-        run: make -C packaging/smoke-test-app install-app-pkg
+      - name: Install smoke-test application package
+        run: make -C packaging/smoke-test-app install-app
 
-      - name: Run smoke-test application against local Scylla
-        run: make -C packaging/smoke-test-app test-package
+      - name: Test smoke-test application
+        run: make -C packaging/smoke-test-app test-app-package
 
       - name: Collect artifacts
         run: |

packaging/smoke-test-app/Makefile

@@ -145,6 +145,37 @@ install-driver-pkg:
 	package_nane="scylla-rs-driver PKG"
 	${INSTALL_PACKAGE_SCRIPT}
 
+ifeq ($(OS_TYPE),macos)
+install-driver: install-driver-pkg
+install-driver-dev: install-driver-dev-pkg
+install-app: install-app-pkg
+
+else ifeq ($(OS_TYPE),windows)
+install-driver:
+	echo "NOT IMPLEMENTED"
+	exit 1
+install-driver-dev:
+	echo "NOT IMPLEMENTED"
+	exit 1
+install-app:
+	echo "NOT IMPLEMENTED"
+	exit 1
+
+else ifeq ($(shell command -v dpkg >/dev/null 2>&1 && echo yes),yes)
+install-driver:
+	$(MAKE) install-driver-deb
+install-driver-dev:
+	$(MAKE) install-driver-dev-deb
+install-app:
+	$(MAKE) install-app-deb
+else
+install-driver:
+	$(MAKE) install-driver-rpm
+install-driver-dev:
+	$(MAKE) install-driver-dev-rpm
+install-app:
+	$(MAKE) install-app-rpm
+endif
 #ifeq ($(OS_TYPE),macos)
 #.install-package: .install-package-macos-pkg
 #else ifeq ($(OS_TYPE),windows)
@@ -153,7 +184,7 @@ install-driver-pkg:
 #.install-package:
 #endif
 
-test-package: .prepare-for-test
+test-app-package: .prepare-for-test
 	@cleanup() {\
 		sudo docker compose -f tests/examples_cluster/docker-compose.yml down --remove-orphans;\
 	};\