From 5d341191d6246d67ab7d09b6fffac0cbdd53d2dc Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sun, 12 Aug 2018 01:22:56 -0700 Subject: [PATCH] removing genproclimit=0 parameter from verusd scripts and cleaning up GitLab CI config --- .gitlab-ci.yml | 7 ++++--- kmd/linux/verus-cli/verusd | 2 +- kmd/mac/verus-cli/verusd | 2 +- kmd/windows/verus-cli/verusd.bat | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 340813887..da5b1b090 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,7 @@ variables: VERUS_CLI_WINDOWS_PORTABLE: verus-cli-windows-v$VERSION-beta.zip VERUS_CLI_MACOS_PORTABLE: verus-cli-mac-v$VERSION-beta.tar.gz EASYDEX_GUI_ARTIFACT: build.tar.gz + WINDOWS_INSTALLER: VerusCoin-v$VERSION-beta-windows-installer.exe build:linux: image: asherd/veruscoin-cross-compiler:linux @@ -248,9 +249,9 @@ package: - cp Media-Assets/Logos/PNG/* assets/imgs/ script: - builder build zcutil/VerusCoin.xml windows --setvars project.version=$VERSION-beta - - mv builds/VerusCoin-v$VERSION-beta-windows-installer.exe . + - mv builds/$WINDOWS_INSTALLER . artifacts: - paths: [VerusCoin-v$VERSION-beta-windows-installer.exe] + paths: [$WINDOWS_INSTALLER] deploy: @@ -268,7 +269,7 @@ deploy: - mkdir -p $CI_COMMIT_REF_NAME/Linux - mkdir -p $CI_COMMIT_REF_NAME/MacOS - ls - - mv $VERUS_CLI_WINDOWS_PORTABLE $AGAMA_ARTIFACTS_WINDOWS VerusCoin-v$VERSION-beta-windows-installer.exe $CI_COMMIT_REF_NAME/Windows + - mv $VERUS_CLI_WINDOWS_PORTABLE $AGAMA_ARTIFACTS_WINDOWS $WINDOWS_INSTALLER $CI_COMMIT_REF_NAME/Windows - mv $VERUS_CLI_LINUX_PORTABLE $AGAMA_ARTIFACTS_LINUX $CI_COMMIT_REF_NAME/Linux - mv $VERUS_CLI_MACOS_PORTABLE $AGAMA_ARTIFACTS_MACOS $CI_COMMIT_REF_NAME/MacOS - echo "$AUTH_KEY" > AUTH_KEY.json diff --git a/kmd/linux/verus-cli/verusd b/kmd/linux/verus-cli/verusd index 7ece5a0db..37eadab4f 100755 --- a/kmd/linux/verus-cli/verusd +++ b/kmd/linux/verus-cli/verusd @@ -1,4 +1,4 @@ #!/bin/bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR -./komodod -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 -gen -genproclimit=0 "$@" +./komodod -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 -gen "$@" diff --git a/kmd/mac/verus-cli/verusd b/kmd/mac/verus-cli/verusd index 9d770bde2..b21197cf9 100755 --- a/kmd/mac/verus-cli/verusd +++ b/kmd/mac/verus-cli/verusd @@ -3,4 +3,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR -./komodod -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 -gen -genproclimit=0 "$@" +./komodod -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 -gen "$@" diff --git a/kmd/windows/verus-cli/verusd.bat b/kmd/windows/verus-cli/verusd.bat index 6670b208d..b252432f5 100644 --- a/kmd/windows/verus-cli/verusd.bat +++ b/kmd/windows/verus-cli/verusd.bat @@ -1,6 +1,6 @@ @call :GET_CURRENT_DIR @cd %THIS_DIR% -komodod.exe -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 -gen -genproclimit=0 %1 %2 %3 %4 %5 %6 %7 %8 %9 +komodod.exe -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 -gen %1 %2 %3 %4 %5 %6 %7 %8 %9 @goto :EOF :GET_CURRENT_DIR