1

Author: dkropachev

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

@@ -64,7 +64,6 @@ jobs:
           cpack -G RPM -C ${{ inputs.build-type }}
 
       - name: Install driver package (DEB)
-        if: runner.os == 'Linux'
         run: |
           set -euo pipefail
           shopt -s nullglob
@@ -77,31 +76,20 @@ jobs:
           sudo apt-get install -f -y
 
       - name: Build smoke-test application package
-        if: runner.os == 'Linux'
         run: |
           set -euo pipefail
-          cmake -S packaging/smoke-test-app -B packaging/smoke-test-app/build \
-            -G Ninja -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} \
-            -DCMAKE_INSTALL_PREFIX=/usr
-          cmake --build packaging/smoke-test-app/build --config ${{ inputs.build-type }}
-          (cd packaging/smoke-test-app/build && cpack -G DEB -C ${{ inputs.build-type }})
-          (cd packaging/smoke-test-app/build && cpack -G RPM -C ${{ inputs.build-type }})
+          make -C packaging/smoke-test-app package \
+            BUILD_TYPE=${{ inputs.build-type }} \
+            CMAKE_GENERATOR=Ninja \
+            INSTALL_PREFIX=/usr \
+            CPACK_GENERATORS="DEB RPM"
 
       - name: Install smoke-test application package (DEB)
-        if: runner.os == 'Linux'
         run: |
           set -euo pipefail
-          shopt -s nullglob
-          APP_PACKAGES=(packaging/smoke-test-app/build/*.deb)
-          if [ "${#APP_PACKAGES[@]}" -eq 0 ]; then
-            echo "No smoke-test DEB packages produced"
-            exit 1
-          fi
-          sudo dpkg -i "${APP_PACKAGES[@]}"
-          sudo apt-get install -f -y
+          make -C packaging/smoke-test-app install-deb
 
       - name: Run smoke-test application against local Scylla
-        if: runner.os == 'Linux'
         run: |
           set -euo pipefail
           cleanup() {
@@ -148,7 +136,6 @@ jobs:
           cpack -G DragNDrop -C ${{ inputs.build-type }}
 
       - name: Install driver package (pkg)
-        if: runner.os == 'macOS'
         run: |
           set -euo pipefail
           shopt -s nullglob
@@ -162,31 +149,17 @@ jobs:
           done
 
       - name: Build smoke-test application package
-        if: runner.os == 'macOS'
         run: |
           set -euo pipefail
-          cmake -S packaging/smoke-test-app -B packaging/smoke-test-app/build \
-            -DCMAKE_BUILD_TYPE=${{ inputs.build-type }}
-          cmake --build packaging/smoke-test-app/build --config ${{ inputs.build-type }}
-          (cd packaging/smoke-test-app/build && cpack -G productbuild -C ${{ inputs.build-type }})
-          (cd packaging/smoke-test-app/build && cpack -G DragNDrop -C ${{ inputs.build-type }})
+          make -C packaging/smoke-test-app package \
+            BUILD_TYPE=${{ inputs.build-type }}
 
       - name: Install smoke-test application package (pkg)
-        if: runner.os == 'macOS'
         run: |
           set -euo pipefail
-          shopt -s nullglob
-          packages=(packaging/smoke-test-app/build/*.pkg)
-          if [ "${#packages[@]}" -eq 0 ]; then
-            echo "No smoke-test pkg packages produced"
-            exit 1
-          fi
-          for pkg in "${packages[@]}"; do
-            sudo installer -pkg "$pkg" -target /
-          done
+          make -C packaging/smoke-test-app install-pkg
 
       - name: Run smoke-test application against local Scylla
-        if: runner.os == 'macOS'
         run: |
           set -euo pipefail
           cleanup() {
@@ -267,7 +240,6 @@ jobs:
         run: cpack -G WIX -C ${{ inputs.build-type }}
 
       - name: Install driver package (MSI)
-        if: runner.os == 'Windows'
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'
@@ -283,7 +255,6 @@ jobs:
           }
 
       - name: Build smoke-test application package
-        if: runner.os == 'Windows'
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'
@@ -295,7 +266,6 @@ jobs:
           Pop-Location
 
       - name: Install smoke-test application package (MSI)
-        if: runner.os == 'Windows'
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'
@@ -311,7 +281,6 @@ jobs:
           }
 
       - name: Run smoke-test application against local Scylla
-        if: runner.os == 'Windows'
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'

packaging/smoke-test-app/Makefile

@@ -0,0 +1,51 @@
+SHELL := /bin/bash
+
+BUILD_DIR ?= build
+BUILD_TYPE ?= Release
+CMAKE_GENERATOR ?=
+INSTALL_PREFIX ?=
+CPACK_GENERATORS ?= productbuild DragNDrop
+INSTALL_TARGET ?= /
+
+CMAKE_GENERATOR_FLAG :=
+ifneq ($(strip $(CMAKE_GENERATOR)),)
+CMAKE_GENERATOR_FLAG := -G $(CMAKE_GENERATOR)
+endif
+
+CMAKE_INSTALL_PREFIX_FLAG :=
+ifneq ($(strip $(INSTALL_PREFIX)),)
+CMAKE_INSTALL_PREFIX_FLAG := -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX)
+endif
+
+.PHONY: package
+package:
+	cmake -S . -B $(BUILD_DIR) $(CMAKE_GENERATOR_FLAG) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(CMAKE_INSTALL_PREFIX_FLAG)
+	cmake --build $(BUILD_DIR) --config $(BUILD_TYPE)
+	for generator in $(CPACK_GENERATORS); do \
+		(cd $(BUILD_DIR) && cpack -G $$generator -C $(BUILD_TYPE)); \
+	done
+
+.PHONY: install-pkg
+install-pkg:
+	set -euo pipefail; \
+	shopt -s nullglob; \
+	packages=($(BUILD_DIR)/*.pkg); \
+	if [ "$${#packages[@]}" -eq 0 ]; then \
+		echo "No smoke-test pkg packages produced"; \
+		exit 1; \
+	fi; \
+	for pkg in "$${packages[@]}"; do \
+		sudo installer -pkg "$$pkg" -target $(INSTALL_TARGET); \
+	done
+
+.PHONY: install-deb
+install-deb:
+	set -euo pipefail; \
+	shopt -s nullglob; \
+	packages=($(BUILD_DIR)/*.deb); \
+	if [ "$${#packages[@]}" -eq 0 ]; then \
+		echo "No smoke-test DEB packages produced"; \
+		exit 1; \
+	fi; \
+	sudo dpkg -i "$${packages[@]}"; \
+	sudo apt-get install -f -y