From c076177d2b39056a26fdb78e23ef70cbeb32e93b Mon Sep 17 00:00:00 2001 From: ppom Date: Wed, 7 Feb 2024 12:00:00 +0100 Subject: [PATCH] release.sh & Makefile: add nft46 --- .gitignore | 1 + Makefile | 2 +- release.sh | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6f59e6c..206e6a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /reaction /ip46tables +/nft46 /reaction*.db /reaction*.sock /result diff --git a/Makefile b/Makefile index cefd9a3..a1d4b20 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ SYSTEMDDIR ?= /etc/systemd all: reaction ip46tables nft46 clean: - rm -f reaction ip46tables reaction.deb deb reaction.minisig ip46tables.minisig reaction.deb.minisig + rm -f reaction ip46tables nft46 reaction.deb deb reaction.minisig ip46tables.minisig reaction.deb.minisig nft46.minisig ip46tables: helpers_c/ip46tables.c $(CC) -s -static helpers_c/ip46tables.c -o ip46tables diff --git a/release.sh b/release.sh index 6470447..286cd7b 100755 --- a/release.sh +++ b/release.sh @@ -2,22 +2,26 @@ set -exu +git push --tags + docker run -it --rm -e HOME=/tmp/ -v "$(pwd)":/tmp/code -w /tmp/code -u "$(id -u)" golang:1.20 make reaction.deb make signatures TAG="$(git tag --sort=v:refname | tail -n1)" -rsync -avz -e 'ssh -J pica01' ./ip46tables ./reaction ./reaction.deb ./ip46tables.minisig ./reaction.minisig ./reaction.deb.minisig akesi:/var/www/static/reaction/releases/"$TAG" +rsync -avz -e 'ssh -J pica01' ./ip46tables ./nft46 ./reaction ./reaction.deb ./nft46.minisig ./ip46tables.minisig ./reaction.minisig ./reaction.deb.minisig akesi:/var/www/static/reaction/releases/"$TAG" TOKEN="$(rbw get framagit.org token)" DATA='{ "tag_name":"'"$TAG"'", "assets":{"links":[ +{"url": "https://static.ppom.me/reaction/releases/'"$TAG"'/nft46", "name": "nft46 (x86-64)", "link_type": "package"}, {"url": "https://static.ppom.me/reaction/releases/'"$TAG"'/reaction", "name": "reaction (x86-64)", "link_type": "package"}, {"url": "https://static.ppom.me/reaction/releases/'"$TAG"'/ip46tables", "name": "ip46tables (x86-64)", "link_type": "package"}, {"url": "https://static.ppom.me/reaction/releases/'"$TAG"'/reaction.deb", "name": "reaction.deb (x86-64)", "link_type": "package"}, +{"url": "https://static.ppom.me/reaction/releases/'"$TAG"'/nft46.minisig", "name": "nft46.minisig", "link_type": "other"}, {"url": "https://static.ppom.me/reaction/releases/'"$TAG"'/reaction.minisig", "name": "reaction.minisig", "link_type": "other"}, {"url": "https://static.ppom.me/reaction/releases/'"$TAG"'/ip46tables.minisig", "name": "ip46tables.minisig", "link_type": "other"}, {"url": "https://static.ppom.me/reaction/releases/'"$TAG"'/reaction.deb.minisig", "name": "reaction.deb.minisig", "link_type": "other"}