diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ad37a695..34b7ca636 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,9 @@ stages: - build - test +variables: + VERSION: "0.3.6" + build:linux: image: asherd/veruscoin-cross-compiler:linux variables: @@ -22,10 +25,13 @@ build:linux: script: - "./zcutil/fetch-params.sh" - "./zcutil/build.sh" - - "cp src/komodod src/komodo-cli kmd/linux/verus-cli && chmod -R +x kmd/linux/verus-cli/" + - "./makeReleaseLinux.sh" + - "cd kmd/linux/" + - "tar -czvf verus-cli-linux-v$VERSION-beta.tar.gz verus-cli" + - "mv verus-cli-linux-v$VERSION-beta.tar.gz ../.." artifacts: paths: - - kmd/linux/verus-cli + - verus-cli-linux-v$VERSION-beta.tar.gz expire_in: 1 week build:windows: @@ -50,10 +56,13 @@ build:windows: script: - "./zcutil/fetch-params.sh" - "./zcutil/build-win.sh" - - "cp src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe kmd/windows/verus-cli" + - "./makeReleaseLinux.sh" + - "cd kmd/windows/" + - "zip verus-cli-windows-v$VERSION-beta.zip verus-cli" + - "mv verus-cli-windows-v$VERSION-beta.zip ../.." artifacts: paths: - - kmd/windows/verus-cli + - verus-cli-windows-v$VERSION-beta.zip expire_in: 1 week build:mac: @@ -67,10 +76,13 @@ build:mac: script: - "./zcutil/fetch-params.sh" - "./zcutil/build-mac.sh | xcpretty" - - "./makeRelease.sh" + - "./makeReleaseMac.sh" + - "cd kmd/mac/" + - "tar -czvf verus-cli-mac-v$VERSION-beta.tar.gz verus-cli" + - "mv verus-cli-mac-v$VERSION-beta.tar.gz ../.." artifacts: paths: - - kmd/mac/verus-cli + - verus-cli-mac-v$VERSION-beta.tar.gz expire_in: 1 week code_quality: diff --git a/kmd/mac/verus-cli/fetch-params.sh b/kmd/mac/verus-cli/fetch-params.sh index 6a2f3925d..d066ac228 100755 --- a/kmd/mac/verus-cli/fetch-params.sh +++ b/kmd/mac/verus-cli/fetch-params.sh @@ -1,165 +1,7 @@ #!/bin/bash set -eu +curl "https://z.cash/downloads/sprout-proving.key" -o "$HOME/Library/Application Support/ZcashParams/sprout-proving.key" +curl "https://z.cash/downloads/sprout-verifying.key" -o "$HOME/Library/Application Support/ZcashParams/sprout-verifying.key" -PARAMS_DIR="$HOME/Library/Application Support/ZcashParams" -SPROUT_PKEY_NAME='sprout-proving.key' -SPROUT_VKEY_NAME='sprout-verifying.key' -SPROUT_URL="https://z.cash/downloads" -SPROUT_IPFS="/ipfs/QmZKKx7Xup7LiAtFRhYsE1M7waXcv9ir9eCECyXAFGxhEo" - -SHA256CMD="$(command -v sha256sum || echo shasum)" -SHA256ARGS="$(command -v sha256sum >/dev/null || echo '-a 256')" - -WGETCMD="$(command -v wget || echo '')" -IPFSCMD="$(command -v ipfs || echo '')" - -# fetch methods can be disabled with ZC_DISABLE_SOMETHING=1 -ZC_DISABLE_WGET="${ZC_DISABLE_WGET:-}" -ZC_DISABLE_IPFS="${ZC_DISABLE_IPFS:-}" - -function fetch_wget { - if [ -z "$WGETCMD" ] || ! [ -z "$ZC_DISABLE_WGET" ]; then - return 1 - fi - - local filename="$1" - local dlname="$2" - - cat <&2 <&2 - exit 1 - fi - fi -} - -# Use flock to prevent parallel execution. -function lock() { - local lockfile=/tmp/fetch_params.lock - # create lock file - eval "exec 200>/$lockfile" - # acquire the lock - flock -n 200 \ - && return 0 \ - || return 1 -} - -function exit_locked_error { - echo "Only one instance of fetch-params.sh can be run at a time." >&2 - exit 1 -} - -function main() { - - lock fetch-params.sh \ - || exit_locked_error - - cat <> "$README_PATH" <