From fae93193e81479a55febe519f25f64369ed302a2 Mon Sep 17 00:00:00 2001 From: Soujanya Mallick Date: Sat, 23 May 2026 02:23:30 +0530 Subject: [PATCH 1/7] Fix: uninstall cleanup removes installed assets --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 67f0882445..64339c47f6 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,8 @@ install: build uninstall: @echo "=== Uninstalling ===" @rm -f /usr/local/bin/amplitron + @rm -rf /usr/local/share/amplitron + @rm -rf /usr/local/bin/assets run: build @echo "=== Running Guitar Amp Simulator ===" From 5a8a1062e980880b14a52bbb5e38fafc0880ce3e Mon Sep 17 00:00:00 2001 From: Soujanya Mallick Date: Sun, 24 May 2026 13:04:06 +0530 Subject: [PATCH 2/7] Test: Add install and uninstall CI smoke test --- .github/workflows/ci.yml | 17 +++++++++++++++++ Makefile | 16 +++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e8898eb9f..2954d5414e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,6 +66,23 @@ jobs: - name: Run Tests run: cd build && ./amplitron-tests + - name: Install Smoke Test + env: + INSTALL_PREFIX: ${{ runner.temp }}/amplitron-install + run: | + make PREFIX="$INSTALL_PREFIX" install + test -x "$INSTALL_PREFIX/bin/Amplitron" + "$INSTALL_PREFIX/bin/Amplitron" --version | grep -q "Amplitron v1.0" + + - name: Uninstall Smoke Test + env: + INSTALL_PREFIX: ${{ runner.temp }}/amplitron-install + run: | + make PREFIX="$INSTALL_PREFIX" uninstall + test ! -e "$INSTALL_PREFIX/bin/Amplitron" + test ! -e "$INSTALL_PREFIX/share/amplitron" + test ! -e "$INSTALL_PREFIX/bin/assets" + - name: Package Build Data for Coverage run: tar -czf build-coverage.tar.gz build/ diff --git a/Makefile b/Makefile index 64339c47f6..072c0d4296 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ BUILD_DIR := build BUILD_TYPE ?= Release CMAKE_FLAGS ?= +PREFIX ?= /usr/local NPROC := $(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4) .PHONY: all build clean rebuild install uninstall setup run help @@ -23,7 +24,7 @@ build: $(BUILD_DIR)/Makefile @echo "=== Building Guitar Amp Simulator ($(BUILD_TYPE)) ===" @cmake --build $(BUILD_DIR) --config $(BUILD_TYPE) -j$(NPROC) @echo "=== Build complete ===" - @echo "Binary: $(BUILD_DIR)/amplitron" + @echo "Binary: $(BUILD_DIR)/Amplitron" clean: @echo "=== Cleaning build directory ===" @@ -33,17 +34,17 @@ rebuild: clean build install: build @echo "=== Installing ===" - @cmake --install $(BUILD_DIR) --prefix /usr/local + @cmake --install $(BUILD_DIR) --prefix $(PREFIX) uninstall: @echo "=== Uninstalling ===" - @rm -f /usr/local/bin/amplitron - @rm -rf /usr/local/share/amplitron - @rm -rf /usr/local/bin/assets + @rm -f $(PREFIX)/bin/Amplitron + @rm -rf $(PREFIX)/share/amplitron + @rm -rf $(PREFIX)/bin/assets run: build @echo "=== Running Guitar Amp Simulator ===" - @./$(BUILD_DIR)/amplitron + @./$(BUILD_DIR)/Amplitron debug: @$(MAKE) BUILD_TYPE=Debug build @@ -56,10 +57,11 @@ help: @echo " make debug - Build the project (Debug)" @echo " make clean - Remove build directory" @echo " make rebuild - Clean + build" - @echo " make install - Install to /usr/local/bin" + @echo " make install - Install to $(PREFIX)/bin" @echo " make uninstall - Remove installed binary" @echo " make run - Build and run" @echo "" @echo "Variables:" @echo " BUILD_TYPE=Debug|Release (default: Release)" + @echo " PREFIX=/path/to/install (default: /usr/local)" @echo " CMAKE_FLAGS=... (extra CMake flags)" From 421c91877ee0f64f7a4bcd26b02095ceab7474ac Mon Sep 17 00:00:00 2001 From: Soujanya Mallick Date: Sat, 23 May 2026 02:23:30 +0530 Subject: [PATCH 3/7] Fix: uninstall cleanup removes installed assets --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 67f0882445..64339c47f6 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,8 @@ install: build uninstall: @echo "=== Uninstalling ===" @rm -f /usr/local/bin/amplitron + @rm -rf /usr/local/share/amplitron + @rm -rf /usr/local/bin/assets run: build @echo "=== Running Guitar Amp Simulator ===" From 6a1d7836a09f7fd15f6c1e19a18c894874212c8d Mon Sep 17 00:00:00 2001 From: Soujanya Mallick Date: Sun, 24 May 2026 13:04:06 +0530 Subject: [PATCH 4/7] Test: Add install and uninstall CI smoke test --- .github/workflows/ci.yml | 17 +++++++++++++++++ Makefile | 16 +++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e8898eb9f..2954d5414e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,6 +66,23 @@ jobs: - name: Run Tests run: cd build && ./amplitron-tests + - name: Install Smoke Test + env: + INSTALL_PREFIX: ${{ runner.temp }}/amplitron-install + run: | + make PREFIX="$INSTALL_PREFIX" install + test -x "$INSTALL_PREFIX/bin/Amplitron" + "$INSTALL_PREFIX/bin/Amplitron" --version | grep -q "Amplitron v1.0" + + - name: Uninstall Smoke Test + env: + INSTALL_PREFIX: ${{ runner.temp }}/amplitron-install + run: | + make PREFIX="$INSTALL_PREFIX" uninstall + test ! -e "$INSTALL_PREFIX/bin/Amplitron" + test ! -e "$INSTALL_PREFIX/share/amplitron" + test ! -e "$INSTALL_PREFIX/bin/assets" + - name: Package Build Data for Coverage run: tar -czf build-coverage.tar.gz build/ diff --git a/Makefile b/Makefile index 64339c47f6..072c0d4296 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ BUILD_DIR := build BUILD_TYPE ?= Release CMAKE_FLAGS ?= +PREFIX ?= /usr/local NPROC := $(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4) .PHONY: all build clean rebuild install uninstall setup run help @@ -23,7 +24,7 @@ build: $(BUILD_DIR)/Makefile @echo "=== Building Guitar Amp Simulator ($(BUILD_TYPE)) ===" @cmake --build $(BUILD_DIR) --config $(BUILD_TYPE) -j$(NPROC) @echo "=== Build complete ===" - @echo "Binary: $(BUILD_DIR)/amplitron" + @echo "Binary: $(BUILD_DIR)/Amplitron" clean: @echo "=== Cleaning build directory ===" @@ -33,17 +34,17 @@ rebuild: clean build install: build @echo "=== Installing ===" - @cmake --install $(BUILD_DIR) --prefix /usr/local + @cmake --install $(BUILD_DIR) --prefix $(PREFIX) uninstall: @echo "=== Uninstalling ===" - @rm -f /usr/local/bin/amplitron - @rm -rf /usr/local/share/amplitron - @rm -rf /usr/local/bin/assets + @rm -f $(PREFIX)/bin/Amplitron + @rm -rf $(PREFIX)/share/amplitron + @rm -rf $(PREFIX)/bin/assets run: build @echo "=== Running Guitar Amp Simulator ===" - @./$(BUILD_DIR)/amplitron + @./$(BUILD_DIR)/Amplitron debug: @$(MAKE) BUILD_TYPE=Debug build @@ -56,10 +57,11 @@ help: @echo " make debug - Build the project (Debug)" @echo " make clean - Remove build directory" @echo " make rebuild - Clean + build" - @echo " make install - Install to /usr/local/bin" + @echo " make install - Install to $(PREFIX)/bin" @echo " make uninstall - Remove installed binary" @echo " make run - Build and run" @echo "" @echo "Variables:" @echo " BUILD_TYPE=Debug|Release (default: Release)" + @echo " PREFIX=/path/to/install (default: /usr/local)" @echo " CMAKE_FLAGS=... (extra CMake flags)" From 12d0fb58c75c213fc9f624909f089563090ba86f Mon Sep 17 00:00:00 2001 From: Soujanya Mallick Date: Sun, 24 May 2026 13:36:30 +0530 Subject: [PATCH 5/7] Test: Add macOS and Windows install/uninstall CI smoke tests --- .github/workflows/ci.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2954d5414e..e9b926fc3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,6 +83,23 @@ jobs: test ! -e "$INSTALL_PREFIX/share/amplitron" test ! -e "$INSTALL_PREFIX/bin/assets" + - name: Install Smoke Test + env: + INSTALL_PREFIX: ${{ runner.temp }}/amplitron-install + run: | + make PREFIX="$INSTALL_PREFIX" install + test -x "$INSTALL_PREFIX/bin/Amplitron" + "$INSTALL_PREFIX/bin/Amplitron" --version | grep -q "Amplitron v1.0" + + - name: Uninstall Smoke Test + env: + INSTALL_PREFIX: ${{ runner.temp }}/amplitron-install + run: | + make PREFIX="$INSTALL_PREFIX" uninstall + test ! -e "$INSTALL_PREFIX/bin/Amplitron" + test ! -e "$INSTALL_PREFIX/share/amplitron" + test ! -e "$INSTALL_PREFIX/bin/assets" + - name: Package Build Data for Coverage run: tar -czf build-coverage.tar.gz build/ @@ -478,6 +495,25 @@ jobs: shell: msys2 {0} run: cd build && ./amplitron-tests.exe + - name: Install Smoke Test + shell: msys2 {0} + env: + INSTALL_PREFIX: ${{ runner.temp }}\amplitron-install + run: | + make PREFIX="$INSTALL_PREFIX" install + test -x "$INSTALL_PREFIX/bin/Amplitron.exe" + "$INSTALL_PREFIX/bin/Amplitron.exe" --version | grep -q "Amplitron v1.0" + + - name: Uninstall Smoke Test + shell: msys2 {0} + env: + INSTALL_PREFIX: ${{ runner.temp }}\amplitron-install + run: | + make PREFIX="$INSTALL_PREFIX" uninstall + test ! -e "$INSTALL_PREFIX/bin/Amplitron.exe" + test ! -e "$INSTALL_PREFIX/share/amplitron" + test ! -e "$INSTALL_PREFIX/bin/assets" + - name: Collect Binaries if: github.ref == 'refs/heads/main' && github.event_name == 'push' shell: msys2 {0} From 47d5643585b1fc15ec495559f3a92a494d6ca11a Mon Sep 17 00:00:00 2001 From: Soujanya Mallick Date: Sun, 24 May 2026 13:40:24 +0530 Subject: [PATCH 6/7] Test: Use cmake --install for Windows smoke test (make not present in MSYS2) --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9b926fc3c..26d2e0d685 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -500,7 +500,7 @@ jobs: env: INSTALL_PREFIX: ${{ runner.temp }}\amplitron-install run: | - make PREFIX="$INSTALL_PREFIX" install + cmake --install build --prefix "$INSTALL_PREFIX" test -x "$INSTALL_PREFIX/bin/Amplitron.exe" "$INSTALL_PREFIX/bin/Amplitron.exe" --version | grep -q "Amplitron v1.0" @@ -509,7 +509,9 @@ jobs: env: INSTALL_PREFIX: ${{ runner.temp }}\amplitron-install run: | - make PREFIX="$INSTALL_PREFIX" uninstall + rm -f "$INSTALL_PREFIX/bin/Amplitron.exe" + rm -rf "$INSTALL_PREFIX/share/amplitron" + rm -rf "$INSTALL_PREFIX/bin/assets" test ! -e "$INSTALL_PREFIX/bin/Amplitron.exe" test ! -e "$INSTALL_PREFIX/share/amplitron" test ! -e "$INSTALL_PREFIX/bin/assets" From 1deea00f122fdbfd277e194190eda326fe5e57d4 Mon Sep 17 00:00:00 2001 From: Soujanya Mallick Date: Sun, 24 May 2026 18:33:47 +0530 Subject: [PATCH 7/7] Fix: move smoke tests to macOS CI --- .github/workflows/ci.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26d2e0d685..640e6c63fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,23 +83,6 @@ jobs: test ! -e "$INSTALL_PREFIX/share/amplitron" test ! -e "$INSTALL_PREFIX/bin/assets" - - name: Install Smoke Test - env: - INSTALL_PREFIX: ${{ runner.temp }}/amplitron-install - run: | - make PREFIX="$INSTALL_PREFIX" install - test -x "$INSTALL_PREFIX/bin/Amplitron" - "$INSTALL_PREFIX/bin/Amplitron" --version | grep -q "Amplitron v1.0" - - - name: Uninstall Smoke Test - env: - INSTALL_PREFIX: ${{ runner.temp }}/amplitron-install - run: | - make PREFIX="$INSTALL_PREFIX" uninstall - test ! -e "$INSTALL_PREFIX/bin/Amplitron" - test ! -e "$INSTALL_PREFIX/share/amplitron" - test ! -e "$INSTALL_PREFIX/bin/assets" - - name: Package Build Data for Coverage run: tar -czf build-coverage.tar.gz build/ @@ -256,6 +239,23 @@ jobs: - name: Run Tests run: cd build && ./amplitron-tests + - name: Install Smoke Test + env: + INSTALL_PREFIX: ${{ runner.temp }}/amplitron-install + run: | + make PREFIX="$INSTALL_PREFIX" install + test -x "$INSTALL_PREFIX/bin/Amplitron" + "$INSTALL_PREFIX/bin/Amplitron" --version | grep -q "Amplitron v1.0" + + - name: Uninstall Smoke Test + env: + INSTALL_PREFIX: ${{ runner.temp }}/amplitron-install + run: | + make PREFIX="$INSTALL_PREFIX" uninstall + test ! -e "$INSTALL_PREFIX/bin/Amplitron" + test ! -e "$INSTALL_PREFIX/share/amplitron" + test ! -e "$INSTALL_PREFIX/bin/assets" + - name: Bundle Dylibs if: github.ref == 'refs/heads/main' && github.event_name == 'push' run: |