Skip to content

Commit a6c12d2

Browse files
AsherdaAsherda
authored
Merge pull request dimxy#124 from VerusCoin/dev
Dev
2 parents 4bdd8e4 + b748ba7 commit a6c12d2

15 files changed

+409
-187
lines changed

‎.gitlab-ci.yml

+127-125
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
stages:
2-
- build
3-
- test
4-
- package
5-
- deploy
6-
2+
- build
3+
- test
4+
- deploy
75

86
variables:
9-
VERSION: 0.3.12
10-
AGAMA_ARTIFACTS_LINUX: linux64.tar.gz
11-
AGAMA_ARTIFACTS_MACOS: osx.tar.gz
12-
AGAMA_ARTIFACTS_WINDOWS: win64.zip
13-
VERUS_CLI_LINUX: verus-cli-linux-v$VERSION-beta.tar.gz
14-
VERUS_CLI_WINDOWS: verus-cli-windows-v$VERSION-beta.zip
15-
VERUS_CLI_MACOS: verus-cli-mac-v$VERSION-beta.tar.gz
16-
WINDOWS_INSTALLER: VerusCoin-v$VERSION-beta-windows-installer.exe
7+
VERSION: 0.3.13
8+
VERUS_CLI_LINUX: "Verus-CLI-Linux-v${VERSION}-beta.tar.gz"
9+
VERUS_CLI_WINDOWS: "Verus-CLI-Windows-v${VERSION}-beta.zip"
10+
VERUS_CLI_MACOS: "Verus-CLI-MacOS-v${VERSION}-beta.tar.gz"
11+
POST_COMMENT: "Branch and Commit: ${CI_COMMIT_REF_NAME} ${CI_COMMIT_SHA} $'\n'MD5: "
1712

18-
.build:linux:
13+
build:linux:
1914
image: asherd/veruscoin-cross-compiler:linux
2015
variables:
2116
DOCKER_DRIVER: overlay2
@@ -26,15 +21,15 @@ variables:
2621
script:
2722
- zcutil/build.sh -j4
2823
- cp src/komodod src/komodo-cli kmd/linux/verus-cli
29-
- chmod +x kmd/linux/verus-cli/komodo
3024
- chmod +x kmd/linux/verus-cli/komodod
25+
- chmod +x kmd/linux/verus-cli/komodo-cli
3126
- chmod +x kmd/linux/verus-cli/verus
3227
- chmod +x kmd/linux/verus-cli/verusd
3328
- chmod +x kmd/linux/verus-cli/fetch-params
3429
- dos2unix kmd/linux/verus-cli/README.txt
35-
- tar -C kmd/linux/ -czvf $VERUS_CLI_LINUX_PORTABLE verus-cli ./
36-
- mv kmd/linux/verus-cli kmd/linux/linux64
37-
- tar -C kmd/linux/ -czvf $AGAMA_ARTIFACTS_LINUX linux64 ./
30+
- cd kmd/linux/
31+
- tar -czvf $VERUS_CLI_LINUX verus-cli
32+
- mv $VERUS_CLI_LINUX ../..
3833
after_script:
3934
- mv /root/.ccache ./ || true
4035
cache:
@@ -44,8 +39,7 @@ variables:
4439
- .ccache
4540
artifacts:
4641
paths:
47-
- $VERUS_CLI_LINUX_PORTABLE
48-
- $AGAMA_ARTIFACTS_LINUX
42+
- $VERUS_CLI_LINUX
4943
expire_in: 1 week
5044

5145

@@ -61,45 +55,37 @@ build:windows:
6155
- .ccache
6256
- .cargo
6357
before_script:
64-
- mkdir .ccache || echo ccache exists
65-
- ln -s $PWD/.ccache /root/.ccache
66-
- mkdir .zcash-params || echo zcash-params exists
67-
- mkdir .cargo || echo .cargo exists
68-
- ln -s $PWD/.cargo /root/.cargo
58+
- mkdir .ccache || echo ccache exists
59+
- ln -s $PWD/.ccache /root/.ccache
60+
- mkdir .zcash-params || echo zcash-params exists
61+
- mkdir .cargo || echo .cargo exists
62+
- ln -s $PWD/.cargo /root/.cargo
6963
script:
70-
- zcutil/build-win.sh
71-
- ./makeReleaseWindows.sh
72-
- cd kmd/windows/
73-
- zip -r $VERUS_CLI_WINDOWS_PORTABLE verus-cli
74-
- mv $VERUS_CLI_WINDOWS_PORTABLE ../..
75-
- mv verus-cli win64
76-
- zip -r $AGAMA_ARTIFACTS_WINDOWS win64
77-
- mv $AGAMA_ARTIFACTS_WINDOWS ../..
64+
- zcutil/build-win.sh -j4
65+
- cp src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe kmd/windows/verus-cli
66+
- cd kmd/windows/
67+
- zip -r $VERUS_CLI_WINDOWS verus-cli
68+
- mv $VERUS_CLI_WINDOWS ../..
7869
artifacts:
79-
paths:
80-
- $VERUS_CLI_WINDOWS_PORTABLE
81-
- $AGAMA_ARTIFACTS_WINDOWS
70+
paths: [$VERUS_CLI_WINDOWS]
8271
expire_in: 1 week
8372

8473

85-
.build:mac:
74+
build:mac:
8675
stage: build
8776
tags: ["High Sierra"]
8877
cache:
8978
key: ${CI_JOB_NAME}
9079
paths:
9180
- depends/built
9281
script:
93-
- zcutil/build-mac.sh | xcpretty
94-
- ./makeReleaseMac.sh
95-
- dos2unix kmd/mac/verus-cli/README.txt
96-
- tar -C kmd/mac/ -czvf $VERUS_CLI_MACOS_PORTABLE verus-cli ./
97-
- mv kmd/mac/verus-cli kmd/mac/osx
98-
- tar -C kmd/mac/ -czvf $AGAMA_ARTIFACTS_MACOS osx ./
82+
- brew bundle
83+
- zcutil/build-mac.sh -j6 | xcpretty
84+
- ./makeReleaseMac.sh
85+
- dos2unix kmd/mac/verus-cli/README.txt
86+
- tar -C kmd/mac/ -czvf $VERUS_CLI_MACOS verus-cli ./
9987
artifacts:
100-
paths:
101-
- $VERUS_CLI_MACOS_PORTABLE
102-
- $AGAMA_ARTIFACTS_MACOS
88+
paths: [$VERUS_CLI_MACOS]
10389
expire_in: 1 week
10490

10591

@@ -109,14 +95,14 @@ build:windows:
10995
DOCKER_DRIVER: overlay2
11096
allow_failure: true
11197
services:
112-
- docker:stable-dind
98+
- docker:stable-dind
11399
script:
114-
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
115-
- docker run
116-
--env SOURCE_CODE="$PWD"
117-
--volume "$PWD":/code
118-
--volume /var/run/docker.sock:/var/run/docker.sock
119-
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
100+
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
101+
- docker run
102+
--env SOURCE_CODE="$PWD"
103+
--volume "$PWD":/code
104+
--volume /var/run/docker.sock:/var/run/docker.sock
105+
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
120106
artifacts:
121107
paths: [gl-code-quality-report.json]
122108

@@ -127,17 +113,17 @@ build:windows:
127113
DOCKER_DRIVER: overlay2
128114
allow_failure: true
129115
services:
130-
- docker:stable-dind
116+
- docker:stable-dind
131117
script:
132-
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
133-
- docker run
134-
--env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
135-
--volume "$PWD:/code"
136-
--volume /var/run/docker.sock:/var/run/docker.sock
137-
"registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
118+
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
119+
- docker run
120+
--env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
121+
--volume "$PWD:/code"
122+
--volume /var/run/docker.sock:/var/run/docker.sock
123+
"registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
138124
artifacts:
139125
paths: [gl-sast-report.json]
140-
126+
141127

142128

143129
.license_management:
@@ -146,12 +132,12 @@ build:windows:
146132
DOCKER_DRIVER: overlay2
147133
allow_failure: true
148134
services:
149-
- docker:stable-dind
135+
- docker:stable-dind
150136
script:
151-
- export LICENSE_MANAGEMENT_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
152-
- docker run
153-
--volume "$PWD:/code"
154-
"registry.gitlab.com/gitlab-org/security-products/license-management:$LICENSE_MANAGEMENT_VERSION" analyze /code
137+
- export LICENSE_MANAGEMENT_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
138+
- docker run
139+
--volume "$PWD:/code"
140+
"registry.gitlab.com/gitlab-org/security-products/license-management:$LICENSE_MANAGEMENT_VERSION" analyze /code
155141
artifacts:
156142
paths: [gl-license-management-report.json]
157143

@@ -162,16 +148,23 @@ build:windows:
162148
DOCKER_DRIVER: overlay2
163149
stage: test
164150
before_script:
165-
- apt update && apt install -y wget g++-multilib libcurl3 python
151+
- apt update && apt install -y wget g++-multilib libcurl3 python
152+
- rm -rf /root/.komodo || true
153+
- mv .komodo /root/ || true
166154
script:
167-
- tar -xzvf $VERUS_CLI_LINUX_PORTABLE
168-
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
169-
- python qa/verus-cli-tests/verus-cli-tester.py
155+
- tar -xzvf $VERUS_CLI_LINUX
156+
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
157+
- python qa/verus-cli-tests/verus-cli-tester.py
158+
after_script:
159+
- mv /root/.komodo ./ || true
160+
cache:
161+
key: ${CI_JOB_NAME}
162+
paths: [.komodo]
170163
artifacts:
171164
paths: [log.txt]
172165
expire_in: 1 week
173166
dependencies:
174-
- build:linux
167+
- build:linux
175168

176169

177170
.ubuntu:bionic:
@@ -180,81 +173,65 @@ build:windows:
180173
DOCKER_DRIVER: overlay2
181174
stage: test
182175
before_script:
183-
- apt update && apt install -y wget g++-multilib libcurl3 python
176+
- apt update && apt install -y wget g++-multilib libcurl3 python
177+
- rm -rf /root/.komodo || true
178+
- mv .komodo /root/ || true
184179
script:
185-
- tar -xzvf $VERUS_CLI_LINUX_PORTABLE
186-
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
187-
- python qa/verus-cli-tests/verus-cli-tester.py
180+
- tar -xzvf $VERUS_CLI_LINUX
181+
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
182+
- python qa/verus-cli-tests/verus-cli-tester.py
183+
after_script:
184+
- mv /root/.komodo ./ || true
185+
cache:
186+
key: ${CI_JOB_NAME}
187+
paths: [.komodo]
188188
artifacts:
189189
paths: [log.txt]
190190
expire_in: 1 week
191191
dependencies:
192-
- build:linux
192+
- build:linux
193193

194194

195195
.osx:sierra: # fetch-params.sh needs to be fixed for MacOS
196196
stage: test
197197
tags: ["Sierra"]
198198
script:
199-
- tar -xzvf $VERUS_CLI_MACOS_PORTABLE
200-
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
201-
- python qa/verus-cli-tests/verus-cli-tester.py
199+
- tar -xzvf $VERUS_CLI_MACOS
200+
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
201+
- python qa/verus-cli-tests/verus-cli-tester.py
202202
artifacts:
203203
paths: [log.txt]
204204
expire_in: 1 week
205205
dependencies:
206-
- build:mac
206+
- build:mac
207207

208208

209209
.osx:high-sierra: # fetch-params.sh needs to be fixed for MacOS
210210
stage: test
211211
tags: ["High Sierra"]
212212
script:
213-
- tar -xzvf $VERUS_CLI_MACOS_PORTABLE
214-
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
215-
- python qa/verus-cli-tests/verus-cli-tester.py
213+
- tar -xzvf $VERUS_CLI_MACOS
214+
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
215+
- python qa/verus-cli-tests/verus-cli-tester.py
216216
artifacts:
217217
paths: [log.txt]
218218
expire_in: 1 week
219219
dependencies:
220-
- build:mac
220+
- build:mac
221221

222222

223223
.windows:10:
224224
stage: test
225225
tags: ["Windows 10"]
226226
script:
227-
- PowerShell Expand-Archive -Path %VERUS_CLI_WINDOWS_PORTABLE% -DestinationPath %CI_PROJECT_DIR%
228-
- set PATH=%PATH%;%CI_PROJECT_DIR%\verus-cli
229-
- qa\verus-cli-tests\verus-cli-tester.py
227+
- PowerShell Expand-Archive -Path %VERUS_CLI_WINDOWS% -DestinationPath %CI_PROJECT_DIR%
228+
- set PATH=%PATH%;%CI_PROJECT_DIR%\verus-cli
229+
- qa\verus-cli-tests\verus-cli-tester.py
230230
artifacts:
231231
paths: [log.txt]
232232
expire_in: 1 week
233233
dependencies:
234-
- build:windows
235-
236-
package:
237-
stage: package
238-
image: asherd/agama-builder
239-
variables:
240-
DOCKER_DRIVER: overlay2
241-
dependencies:
242-
- build:windows
243-
before_script:
244-
- unzip $VERUS_CLI_WINDOWS_PORTABLE
245-
- echo "$AUTH_KEY" > AUTH_KEY.json
246-
- gcloud auth activate-service-account --key-file AUTH_KEY.json
247-
- rm AUTH_KEY.json
248-
- gsutil cp $STAGING/Agama/installer-prototype/Windows/Agama-win32-x64-v${VERSION}-beta.zip .
249-
- unzip Agama-win32-x64-v${VERSION}-beta.zip
250-
- git clone https://github.com/VerusCoin/Media-Assets --single-branch -b master
251-
- mkdir -p assets/imgs/
252-
- cp Media-Assets/Logos/PNG/* assets/imgs/
253-
script:
254-
- builder build zcutil/VerusCoin.xml windows --setvars project.version=$VERSION-beta
255-
- mv builds/$WINDOWS_INSTALLER .
256-
artifacts:
257-
paths: [$WINDOWS_INSTALLER]
234+
- build:windows
258235

259236

260237
deploy:
@@ -263,19 +240,44 @@ deploy:
263240
variables:
264241
DOCKER_DRIVER: overlay2
265242
dependencies:
266-
#- build:linux
267-
#- build:windows
268-
#- build:mac
269-
- package
243+
- build:linux
244+
- build:windows
245+
- build:mac
246+
before_script:
247+
- export VERUS_CLI_LINUX_MD5=$(md5sum $VERUS_CLI_LINUX | cut -d " " -f 1)
248+
- export VERUS_CLI_WINDOWS_MD5=$(md5sum $VERUS_CLI_WINDOWS | cut -d " " -f 1)
249+
- export VERUS_CLI_MACOS_MD5=$(md5sum $VERUS_CLI_MACOS | cut -d " " -f 1)
270250
script:
271-
#- mkdir -p $CI_COMMIT_REF_NAME/Windows
272-
#- mkdir -p $CI_COMMIT_REF_NAME/Linux
273-
#- mkdir -p $CI_COMMIT_REF_NAME/MacOS
274-
#- mv $VERUS_CLI_WINDOWS_PORTABLE $AGAMA_ARTIFACTS_WINDOWS $WINDOWS_INSTALLER $CI_COMMIT_REF_NAME/Windows
275-
#- mv $VERUS_CLI_LINUX_PORTABLE $AGAMA_ARTIFACTS_LINUX $CI_COMMIT_REF_NAME/Linux
276-
#- mv $VERUS_CLI_MACOS_PORTABLE $AGAMA_ARTIFACTS_MACOS $CI_COMMIT_REF_NAME/MacOS
277-
- echo "$AUTH_KEY" > AUTH_KEY.json
278-
- gcloud auth activate-service-account --key-file AUTH_KEY.json
279-
#- gsutil rsync -r $CI_COMMIT_REF_NAME/ $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/
280-
- gsutil cp $WINDOWS_INSTALLER $CI_COMMIT_REF_NAME/ $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/Windows/
251+
- export VERUS_CLI_LINUX_MD5=$(md5sum $VERUS_CLI_LINUX | cut -d " " -f 1)
252+
- curl -F file=@"$VERUS_CLI_LINUX"
253+
-F channels="$CLI_POST_CHANNEL"
254+
-F initial_comment="${POST_COMMENT}$VERUS_CLI_LINUX_MD5"
255+
-H "${SLACK_BOT_AUTH}"
256+
"https://slack.com/api/files.upload"
257+
- curl -F file=@"$VERUS_CLI_WINDOWS"
258+
-F channels="$CLI_POST_CHANNEL"
259+
-F initial_comment="${POST_COMMENT}$VERUS_CLI_WINDOWS_MD5"
260+
-H "${SLACK_BOT_AUTH}"
261+
"https://slack.com/api/files.upload"
262+
- curl -F file=@"$VERUS_CLI_MACOS"
263+
-F channels="$CLI_POST_CHANNEL"
264+
-F initial_comment="${POST_COMMENT}$VERUS_CLI_MACOS_MD5"
265+
-H "${SLACK_BOT_AUTH}"
266+
"https://slack.com/api/files.upload"
267+
- mkdir Windows && mkdir Linux && mkdir MacOS &&
268+
mv $VERUS_CLI_WINDOWS Windows &&
269+
mv $VERUS_CLI_LINUX Linux &&
270+
mv $VERUS_CLI_MACOS MacOS
271+
- echo "$AUTH_KEY" > AUTH_KEY.json &&
272+
gcloud auth activate-service-account
273+
--key-file AUTH_KEY.json
274+
- gsutil cp -r Windows Linux MacOS $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/
275+
- curl -X POST
276+
-F token="$CI_JOB_TOKEN"
277+
-F ref=dev
278+
-F variables\[UPSTREAM_CLI_BRANCH\]="$CI_COMMIT_REF_NAME"
279+
-F variables\[VERUS_CLI_LINUX\]="$VERUS_CLI_LINUX"
280+
-F variables\[VERUS_CLI_WINDOWS\]="$VERUS_CLI_WINDOWS"
281+
-F variables\[VERUS_CLI_MACOS\]="$VERUS_CLI_MACOS"
282+
"https://gitlab.com/api/v4/projects/8018592/trigger/pipeline"
281283

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
## VerusCoin version 0.3.12a-beta
1+
## VerusCoin version 0.3.13-beta
22

33
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).
44
- [VerusCoin web site https://veruscoin.io/ Wallets and CLI tools](https://veruscoin.io/)
55
- [VerusCoin Explorer](https://explorer.veruscoin.io/)
66

7-
Version 0.3.12-beta has portable mining working.
7+
Version 0.3.13-beta has portable mining working.
88

99
## Komodo with Bitcore
1010
This version of Komodo contains Bitcore support for komodo and all its assetchains.

0 commit comments

Comments
 (0)