diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81cb62ac8..86be2c3f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,14 @@ build:linux: variables: DOCKER_DRIVER: overlay2 stage: build + cache: + key: ${CI_JOB_NAME} + paths: + - depends/built + - .ccache + before_script: + - mkdir .ccache || echo ccache exists + - ln -s $PWD/.ccache /root/.ccache script: - "./zcutil/build.sh" ##- "./zcutil/build-debian-package.sh" @@ -35,6 +43,7 @@ build:linux: - $AGAMA_ARTIFACTS_LINUX expire_in: 1 week + build:windows: image: asherd/veruscoin-cross-compiler:latest variables: @@ -54,6 +63,7 @@ build:windows: - mkdir .cargo || echo .cargo exists - ln -s $PWD/.cargo /root/.cargo script: + ## add dos2unix - "./zcutil/build-win.sh" - "./makeReleaseWindows.sh" - "cd kmd/windows/" @@ -68,6 +78,7 @@ build:windows: - $AGAMA_ARTIFACTS_WINDOWS expire_in: 1 week + build:mac: stage: build tags: ["osx"] @@ -75,7 +86,6 @@ build:mac: key: ${CI_JOB_NAME} paths: - depends/built - script: - "./zcutil/build-mac.sh | xcpretty" - "./makeReleaseMac.sh" @@ -91,7 +101,8 @@ build:mac: - $AGAMA_ARTIFACTS_MACOS expire_in: 1 week -.code_quality: + +code_quality: image: docker:stable variables: DOCKER_DRIVER: overlay2 @@ -108,7 +119,8 @@ build:mac: artifacts: paths: [gl-code-quality-report.json] -.sast: + +sast: image: docker:stable variables: DOCKER_DRIVER: overlay2 @@ -124,6 +136,7 @@ build:mac: "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code artifacts: paths: [gl-sast-report.json] + deploy: stage: deploy @@ -144,4 +157,5 @@ deploy: - "mv $AGAMA_ARTIFACTS_MACOS $VERUS_CLI_MACOS_PORTABLE $CI_COMMIT_REF_NAME/MacOS" - 'echo "$AUTH_KEY" > AUTH_KEY.json' - "gcloud auth activate-service-account --key-file AUTH_KEY.json" - - "gsutil rsync -r $CI_COMMIT_REF_NAME/ $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/" \ No newline at end of file + - "gsutil rsync -r $CI_COMMIT_REF_NAME/ $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/" + diff --git a/README.md b/README.md index 812697f52..848dcd445 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## VerusCoin version 0.3.8-beta +## VerusCoin version 0.3.9-beta VerusCoin is a new, mineable and stakeable cryptocurrency. It is a live fork of Komodo that retains its Zcash lineage and improves it. VerusCoin will leverage the Komodo platform and dPoW notarization for enhanced security and cross-chain interoperability. We have added a variation of a zawy12, lwma difficulty algorithm, a new CPU-optimized hash algorithm and a new algorithm for fair proof of stake. We describe these changes and vision going forward in a [our Phase I white paper](http://185.25.51.16/papers/VerusPhaseI.pdf) and [our Vision](http://185.25.51.16/papers/VerusVision.pdf). - [VerusCoin web site https://veruscoin.io/ Wallets and CLI tools](https://veruscoin.io/) - [VerusCoin Explorer](https://explorer.veruscoin.io/) diff --git a/src/verusd b/src/verusd index 25def9f4f..c0b7048e7 100755 --- a/src/verusd +++ b/src/verusd @@ -1,2 +1,5 @@ #!/bin/bash -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 -addnode=185.25.48.72 -addnode=185.25.48.236 -addnode=185.64.105.111 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 -gen -genproclimit=0 "$@" +#set working directory to the location of this script +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 -addnode=185.25.48.72 -addnode=185.25.48.236 -addnode=185.64.105.111 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 -gen -genproclimit=0 "$@" diff --git a/zcutil/build-debian-package.sh b/zcutil/build-debian-package.sh index a22854cdc..5207716ca 100755 --- a/zcutil/build-debian-package.sh +++ b/zcutil/build-debian-package.sh @@ -19,7 +19,9 @@ fi ## PACKAGE_VERSION=$($SRC_PATH/src/zcashd --version | grep version | cut -d' ' -f4 | tr -d v) ## Need version setting from environment -PACKAGE_VERSION=0.3.8-beta + +PACKAGE_VERSION=0.3.9-beta + ## ## Also, what does the sed end up doing? DEBVERSION=$(echo $PACKAGE_VERSION | sed 's/-beta/~beta/' | sed 's/-rc/~rc/' | sed 's/-/+/')