From e8000214b464b9c0c7d2806a15e9c3f5ac402c48 Mon Sep 17 00:00:00 2001 From: voidderef <84345133+voidderef@users.noreply.github.com> Date: Fri, 3 Oct 2025 18:20:23 +0200 Subject: [PATCH] fix: Remove obsolete pumptools-public release package Since the pumptools.zip package contains already everything that's supposed to be released on the previous version already, a separate "public" release isn't required anymore. Also address this issue in the github workflows to publish the full package including everything. --- .github/workflows/build-master.yaml | 2 +- .github/workflows/build-tag.yaml | 2 +- Makefile | 2 +- Package.mk | 22 ---------------------- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-master.yaml b/.github/workflows/build-master.yaml index 9763896..bc61613 100644 --- a/.github/workflows/build-master.yaml +++ b/.github/workflows/build-master.yaml @@ -27,7 +27,7 @@ jobs: run: | mkdir artifact cd artifact - unzip ../build/docker/pumptools-public.zip + unzip ../build/docker/pumptools.zip cd .. - name: "Upload artifact" diff --git a/.github/workflows/build-tag.yaml b/.github/workflows/build-tag.yaml index fda9ff2..17df33d 100644 --- a/.github/workflows/build-tag.yaml +++ b/.github/workflows/build-tag.yaml @@ -28,7 +28,7 @@ jobs: run: | mkdir artifact cd artifact - unzip ../build/docker/pumptools-public.zip + unzip ../build/docker/pumptools.zip cd .. - name: "Upload artifact" diff --git a/Makefile b/Makefile index e29529a..70a68a3 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ clang-format: $(V)find src/test -iname *.h -o -iname *.c | xargs clang-format -i -style=file .PHONY: package # Package the build output into distribution zip files -package: $(BUILDDIR)/pumptools.zip $(BUILDDIR)/pumptools-public.zip +package: $(BUILDDIR)/pumptools.zip include Package.mk diff --git a/Package.mk b/Package.mk index 751e29c..8a6c051 100644 --- a/Package.mk +++ b/Package.mk @@ -236,25 +236,3 @@ $(builddir)/pumptools.zip: \ $(builddir)/libc-version $(V)echo ... $@ $(V)zip -j $@ $^ - -$(builddir)/pumptools-public.zip: \ - $(zipdir)/api.zip \ - $(zipdir)/doc.zip \ - $(zipdir)/exchook.zip \ - $(zipdir)/mk3hook.zip \ - $(zipdir)/nxhook.zip \ - $(zipdir)/nx2hook.zip \ - $(zipdir)/nxahook.zip \ - $(zipdir)/piubtn.zip \ - $(zipdir)/piuio.zip \ - $(zipdir)/pro2hook.zip \ - $(zipdir)/prohook.zip \ - $(zipdir)/x2hook.zip \ - $(zipdir)/zerohook.zip \ - CHANGELOG.md \ - LICENSE \ - README.md \ - $(builddir)/git-version \ - $(builddir)/libc-version - $(V)echo ... $@ - $(V)zip -j $@ $^