diff --git a/.github/workflows/build-linux-arm64.yml b/.github/workflows/build-linux-arm64.yml index 42e44d10..a3616d56 100644 --- a/.github/workflows/build-linux-arm64.yml +++ b/.github/workflows/build-linux-arm64.yml @@ -62,7 +62,7 @@ jobs: submodules: recursive - name: install dependencies - run: sudo apt-get install -y autotools-dev git build-essential libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev pngquant + run: sudo apt-get install -y autotools-dev rpm git build-essential libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev pngquant - name: Cache SDK Folder uses: actions/cache@v4 diff --git a/.github/workflows/build-linux-intel.yml b/.github/workflows/build-linux-intel.yml index a86b9720..712ae33c 100644 --- a/.github/workflows/build-linux-intel.yml +++ b/.github/workflows/build-linux-intel.yml @@ -34,7 +34,7 @@ jobs: - name: install dependencies if: steps.cache.outputs.cache-hit != 'true' - run: sudo apt-get install -y autotools-dev git build-essential + run: sudo apt-get install -y autotools-dev rpm git build-essential - uses: actions/setup-python@v5 if: steps.cache.outputs.cache-hit != 'true' diff --git a/Makefile b/Makefile index 674bbd4c..cdb474c5 100644 --- a/Makefile +++ b/Makefile @@ -75,10 +75,12 @@ all: help testnet: $(MAKE) configure TESTNET=1 CONAN_HOME=$(CONAN_CACHE) $(CONAN_EXECUTABLE) build . + $(MAKE) package mainnet: $(MAKE) configure TESTNET=0 CONAN_HOME=$(CONAN_CACHE) $(CONAN_EXECUTABLE) build . + $(MAKE) package release: docs build (cd $(BUILD_FOLDER) && cpack) @@ -91,6 +93,11 @@ build-deps: conan-profile-detect @echo "Build Dependencies: $(BUILD_TYPE) testnet=$(TESTNET)" CONAN_HOME=$(CONAN_CACHE) $(CONAN_EXECUTABLE) install . --build=missing -s build_type=$(BUILD_TYPE) +package: + @echo "Packaging: $(BUILD_TYPE) testnet=$(TESTNET)" + (cd $(BUILD_FOLDER) && cpack) + @rm -rf $(CURDIR)/build/packages/_CPack_Packages + configure: build-deps @echo "Running Configure: $(BUILD_TYPE) testnet=$(TESTNET)" cmake --preset $(PRESET_CONFIGURE) -DSTATIC=$(STATIC) -DTESTNET=$(TESTNET) -DBUILD_VERSION=$(BUILD_VERSION)