diff --git a/.gitignore b/.gitignore index b9b9daf6..fe8d954e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /target /radicle-cli/target /build/artifacts +/build/*.tar.gz diff --git a/build/build b/build/build index 70bcd91a..c34c83ee 100755 --- a/build/build +++ b/build/build @@ -22,8 +22,7 @@ main() { fi rev="$(git rev-parse --short HEAD)" - tempdir="$(mktemp -d)" - gitarchive="$tempdir/heartwood-$rev.tar.gz" + gitarchive="build/heartwood-$rev.tar.gz" keypath="$(rad path)/keys/radicle.pub" version="$(build/version)" image=radicle-build-$version @@ -73,7 +72,6 @@ main() { done # Remove build artifacts that aren't needed anymore. - rm -f $gitarchive podman rm radicle-build-container > /dev/null podman rmi --ignore localhost/$image } diff --git a/build/upload b/build/upload index 53261b87..b8020b5f 100755 --- a/build/upload +++ b/build/upload @@ -14,15 +14,18 @@ main() { echo "fatal: empty version number" >&2 ; exit 1 fi + destination="/mnt/radicle/files/releases/$version" + # Create remote folder. - ssh -i $SSH_KEY $SSH_ADDRESS mkdir -p /mnt/radicle/files/releases/$version + ssh -i $SSH_KEY $SSH_ADDRESS mkdir -p $destination # Copy files over. - scp -i $SSH_KEY build/artifacts/radicle-$version* $SSH_ADDRESS:/mnt/radicle/files/releases/$version - scp -i $SSH_KEY build/artifacts/radicle.json $SSH_ADDRESS:/mnt/radicle/files/releases/$version + scp -i $SSH_KEY build/artifacts/radicle-$version* $SSH_ADDRESS:$destination + scp -i $SSH_KEY build/artifacts/radicle.json $SSH_ADDRESS:$destination + scp -i $SSH_KEY build/heartwood-$version.tar.gz $SSH_ADDRESS:$destination for target in $(cat build/TARGETS); do - archive=/mnt/radicle/files/releases/$version/radicle-$version-$target.tar.xz - symlink=/mnt/radicle/files/releases/$version/radicle-$target.tar.xz + archive=$destination/radicle-$version-$target.tar.xz + symlink=$destination/radicle-$target.tar.xz echo "Creating symlinks for $target.."