From e97165094e683664d6ba79974f81872e63ed84f2 Mon Sep 17 00:00:00 2001 From: Drazen Date: Mon, 5 Feb 2024 21:35:15 +0100 Subject: [PATCH 1/2] Fix builds action --- .../workflows/ci-build-upload-binaries.yml | 4 ++-- Makefile | 15 +++++++++---- scripts/ppa.sh | 22 ------------------- 3 files changed, 13 insertions(+), 28 deletions(-) delete mode 100755 scripts/ppa.sh diff --git a/.github/workflows/ci-build-upload-binaries.yml b/.github/workflows/ci-build-upload-binaries.yml index 3465e7921a..e9d266c67d 100644 --- a/.github/workflows/ci-build-upload-binaries.yml +++ b/.github/workflows/ci-build-upload-binaries.yml @@ -61,7 +61,7 @@ jobs: - name: Build deb packages shell: bash - run: scripts/ppa.sh ${{ secrets.PPA_SIGNING_KEY }} + run: make deb - name: Prepare build output shell: bash @@ -77,7 +77,7 @@ jobs: cp target/release/nym-network-statistics $OUTPUT_DIR cp target/release/nym-cli $OUTPUT_DIR cp target/release/explorer-api $OUTPUT_DIR - cp ppa/debian/* $OUTPUT_DIR + cp target/debian/* $OUTPUT_DIR - name: Deploy branch to CI www continue-on-error: true diff --git a/Makefile b/Makefile index da23d9e143..6be3f9f495 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ help: @echo " clippy: run clippy for all workspaces" @echo " test: run clippy, unit tests, and formatting." @echo " test-all: like test, but also includes the expensive tests" - @echo " ppa: build debian package and generate files required for PPA update" + @echo " deb: build debian packages # ----------------------------------------------------------------------------- # Meta targets @@ -176,6 +176,13 @@ run-api-tests: cd nym-api/tests/functional_test && yarn test:qa # Build debian package, and update PPA -# Requires base64 encode GPG key to be set up in environment PPA_SIGNING_KEY -# ppa: build-nym-mixnode build-nym-gateway -# scripts/ppa.sh +deb-mixnode: build-nym-mixnode + cargo deb -p nym-mixnode + +deb-gateway: build-nym-gateway + cargo deb -p nym-gateway + +deb-cli: build-nym-cli + cargo deb -p nym-cli + +deb: deb-mixnode deb-gateway deb-cli \ No newline at end of file diff --git a/scripts/ppa.sh b/scripts/ppa.sh deleted file mode 100755 index 0dbac24fee..0000000000 --- a/scripts/ppa.sh +++ /dev/null @@ -1,22 +0,0 @@ -#/bin/bash -# Run from repository root -# Takes PPA_SIGNING_KEY base64 encoded as first argument - -echo $1 | base64 -d >ppa-signing-key.asc -gpg --import ppa-signing-key.asc -rm ppa-signing-key.asc - -cargo deb -p nym-mixnode -cargo deb -p nym-gateway -cargo deb -p nym-cli - -mv target/debian/*.deb ppa/debian - -cd ppa - -dpkg-scanpackages --multiversion . >Packages -gzip -k -f Packages - -apt-ftparchive release . >Release -gpg --default-key "nym@nymtech.net" -abs -o - Release >Release.gpg -gpg --default-key "nym@nymtech.net" --clearsign -o - Release >InRelease From a0e9e5ef96692c784af0ee71fc6eb4fe1e8679e5 Mon Sep 17 00:00:00 2001 From: Drazen Date: Mon, 5 Feb 2024 21:39:14 +0100 Subject: [PATCH 2/2] Filter deb files --- .github/workflows/ci-build-upload-binaries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build-upload-binaries.yml b/.github/workflows/ci-build-upload-binaries.yml index e9d266c67d..aa601b6b1e 100644 --- a/.github/workflows/ci-build-upload-binaries.yml +++ b/.github/workflows/ci-build-upload-binaries.yml @@ -77,7 +77,7 @@ jobs: cp target/release/nym-network-statistics $OUTPUT_DIR cp target/release/nym-cli $OUTPUT_DIR cp target/release/explorer-api $OUTPUT_DIR - cp target/debian/* $OUTPUT_DIR + cp target/debian/*.deb $OUTPUT_DIR - name: Deploy branch to CI www continue-on-error: true