Skip to content

Commit 0f92550

Browse files
miketoutmiketout
authored
Merge pull request #21 from miketout/master
Reverse merge from VerusCoin through master
2 parents 4ca6678 + 206df04 commit 0f92550

35 files changed

+916
-217
lines changed

‎.gitlab-ci.yml

+142-114
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,45 @@
11
stages:
2-
- build
3-
- test
4-
- deploy
2+
- build
3+
- test
4+
- deploy
55

66
variables:
7-
VERSION: 0.3.10
8-
AGAMA_ARTIFACTS_LINUX: linux64.tar.gz
9-
AGAMA_ARTIFACTS_MACOS: osx.tar.gz
10-
AGAMA_ARTIFACTS_WINDOWS: win64.zip
11-
VERUS_CLI_DEBIAN: verus-cli-v${VERSION}-beta-amd64.deb
12-
VERUS_CLI_LINUX_PORTABLE: verus-cli-linux-v$VERSION-beta.tar.gz
13-
VERUS_CLI_WINDOWS_PORTABLE: verus-cli-windows-v$VERSION-beta.zip
14-
VERUS_CLI_MACOS_PORTABLE: verus-cli-mac-v$VERSION-beta.tar.gz
15-
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: "
1612

1713
build:linux:
1814
image: asherd/veruscoin-cross-compiler:linux
1915
variables:
2016
DOCKER_DRIVER: overlay2
2117
stage: build
22-
cache:
23-
key: ${CI_JOB_NAME}
24-
paths:
25-
- depends/built
26-
- .ccache
2718
before_script: # Setup Cache
28-
- rm -rf /root/.ccache || true
29-
- mv .ccache /root/ || true
19+
- rm -rf /root/.ccache || true
20+
- mv .ccache /root/ || true
3021
script:
31-
- zcutil/build.sh -j4
32-
- ./makeReleaseLinux.sh
33-
- dos2unix kmd/linux/verus-cli/README.txt
34-
- tar -C kmd/linux/ -czvf $VERUS_CLI_LINUX_PORTABLE verus-cli ./
35-
- mv kmd/linux/verus-cli kmd/linux/linux64
36-
- tar -C kmd/linux/ -czvf $AGAMA_ARTIFACTS_LINUX linux64 ./
22+
- zcutil/build.sh -j4
23+
- cp src/komodod src/komodo-cli kmd/linux/verus-cli
24+
- chmod +x kmd/linux/verus-cli/komodod
25+
- chmod +x kmd/linux/verus-cli/komodo-cli
26+
- chmod +x kmd/linux/verus-cli/verus
27+
- chmod +x kmd/linux/verus-cli/verusd
28+
- chmod +x kmd/linux/verus-cli/fetch-params
29+
- dos2unix kmd/linux/verus-cli/README.txt
30+
- cd kmd/linux/
31+
- tar -czvf $VERUS_CLI_LINUX verus-cli
32+
- mv $VERUS_CLI_LINUX ../..
3733
after_script:
38-
- mv /root/.ccache ./ || true
34+
- mv /root/.ccache ./ || true
3935
cache:
4036
key: ${CI_JOB_NAME}
4137
paths:
4238
- depends/built
4339
- .ccache
4440
artifacts:
4541
paths:
46-
- $VERUS_CLI_LINUX_PORTABLE
47-
- $AGAMA_ARTIFACTS_LINUX
42+
- $VERUS_CLI_LINUX
4843
expire_in: 1 week
4944

5045

@@ -60,24 +55,19 @@ build:windows:
6055
- .ccache
6156
- .cargo
6257
before_script:
63-
- mkdir .ccache || echo ccache exists
64-
- ln -s $PWD/.ccache /root/.ccache
65-
- mkdir .zcash-params || echo zcash-params exists
66-
- mkdir .cargo || echo .cargo exists
67-
- 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
6863
script:
69-
- zcutil/build-win.sh
70-
- ./makeReleaseWindows.sh
71-
- cd kmd/windows/
72-
- zip -r $VERUS_CLI_WINDOWS_PORTABLE verus-cli
73-
- mv $VERUS_CLI_WINDOWS_PORTABLE ../..
74-
- mv verus-cli win64
75-
- zip -r $AGAMA_ARTIFACTS_WINDOWS win64
76-
- 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 ../..
7769
artifacts:
78-
paths:
79-
- $VERUS_CLI_WINDOWS_PORTABLE
80-
- $AGAMA_ARTIFACTS_WINDOWS
70+
paths: [$VERUS_CLI_WINDOWS]
8171
expire_in: 1 week
8272

8373

@@ -89,147 +79,159 @@ build:mac:
8979
paths:
9080
- depends/built
9181
script:
92-
- zcutil/build-mac.sh | xcpretty
93-
- ./makeReleaseMac.sh
94-
- dos2unix kmd/mac/verus-cli/README.txt
95-
- tar -C kmd/mac/ -czvf $VERUS_CLI_MACOS_PORTABLE verus-cli ./
96-
- mv kmd/mac/verus-cli kmd/mac/osx
97-
- 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 ./
9887
artifacts:
99-
paths:
100-
- $VERUS_CLI_MACOS_PORTABLE
101-
- $AGAMA_ARTIFACTS_MACOS
88+
paths: [$VERUS_CLI_MACOS]
10289
expire_in: 1 week
10390

10491

105-
code_quality:
92+
.code_quality:
10693
image: docker:stable
10794
variables:
10895
DOCKER_DRIVER: overlay2
10996
allow_failure: true
11097
services:
111-
- docker:stable-dind
98+
- docker:stable-dind
11299
script:
113-
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
114-
- docker run
115-
--env SOURCE_CODE="$PWD"
116-
--volume "$PWD":/code
117-
--volume /var/run/docker.sock:/var/run/docker.sock
118-
"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
119106
artifacts:
120107
paths: [gl-code-quality-report.json]
121108

122109

123-
sast:
110+
.sast:
124111
image: docker:stable
125112
variables:
126113
DOCKER_DRIVER: overlay2
127114
allow_failure: true
128115
services:
129-
- docker:stable-dind
116+
- docker:stable-dind
130117
script:
131-
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
132-
- docker run
133-
--env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
134-
--volume "$PWD:/code"
135-
--volume /var/run/docker.sock:/var/run/docker.sock
136-
"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
137124
artifacts:
138125
paths: [gl-sast-report.json]
139-
140126

141127

142-
license_management:
128+
129+
.license_management:
143130
image: docker:stable
144131
variables:
145132
DOCKER_DRIVER: overlay2
146133
allow_failure: true
147134
services:
148-
- docker:stable-dind
135+
- docker:stable-dind
149136
script:
150-
- export LICENSE_MANAGEMENT_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
151-
- docker run
152-
--volume "$PWD:/code"
153-
"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
154141
artifacts:
155142
paths: [gl-license-management-report.json]
156143

157-
ubuntu:xenial:
144+
145+
.ubuntu:xenial:
158146
image: ubuntu:xenial
159147
variables:
160148
DOCKER_DRIVER: overlay2
161149
stage: test
162150
before_script:
163-
- 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
164154
script:
165-
- tar -xzvf $VERUS_CLI_LINUX_PORTABLE
166-
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
167-
- 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]
168163
artifacts:
169164
paths: [log.txt]
170165
expire_in: 1 week
171166
dependencies:
172-
- build:linux
167+
- build:linux
173168

174169

175-
ubuntu:bionic:
170+
.ubuntu:bionic:
176171
image: ubuntu:bionic
177172
variables:
178173
DOCKER_DRIVER: overlay2
179174
stage: test
180175
before_script:
181-
- 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
182179
script:
183-
- tar -xzvf $VERUS_CLI_LINUX_PORTABLE
184-
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
185-
- 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]
186188
artifacts:
187189
paths: [log.txt]
188190
expire_in: 1 week
189191
dependencies:
190-
- build:linux
192+
- build:linux
191193

192194

193195
.osx:sierra: # fetch-params.sh needs to be fixed for MacOS
194196
stage: test
195197
tags: ["Sierra"]
196198
script:
197-
- tar -xzvf $VERUS_CLI_MACOS_PORTABLE
198-
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
199-
- 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
200202
artifacts:
201203
paths: [log.txt]
202204
expire_in: 1 week
203205
dependencies:
204-
- build:mac
206+
- build:mac
205207

206208

207209
.osx:high-sierra: # fetch-params.sh needs to be fixed for MacOS
208210
stage: test
209211
tags: ["High Sierra"]
210212
script:
211-
- tar -xzvf $VERUS_CLI_MACOS_PORTABLE
212-
- export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
213-
- 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
214216
artifacts:
215217
paths: [log.txt]
216218
expire_in: 1 week
217219
dependencies:
218-
- build:mac
220+
- build:mac
219221

220222

221-
windows:10:
223+
.windows:10:
222224
stage: test
223225
tags: ["Windows 10"]
224226
script:
225-
- PowerShell Expand-Archive -Path %VERUS_CLI_WINDOWS_PORTABLE% -DestinationPath %CI_PROJECT_DIR%
226-
- set PATH=%PATH%;%CI_PROJECT_DIR%\verus-cli
227-
- 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
228230
artifacts:
229231
paths: [log.txt]
230232
expire_in: 1 week
231233
dependencies:
232-
- build:windows
234+
- build:windows
233235

234236

235237
deploy:
@@ -238,18 +240,44 @@ deploy:
238240
variables:
239241
DOCKER_DRIVER: overlay2
240242
dependencies:
241-
- build:linux
242-
- build:windows
243-
- build:mac
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)
244250
script:
245-
- mkdir -p $CI_COMMIT_REF_NAME/Windows
246-
- mkdir -p $CI_COMMIT_REF_NAME/Linux
247-
- mkdir -p $CI_COMMIT_REF_NAME/MacOS
248-
- mv $VERUS_CLI_WINDOWS_PORTABLE $AGAMA_ARTIFACTS_WINDOWS $CI_COMMIT_REF_NAME/Windows
249-
- mv $VERUS_CLI_LINUX_PORTABLE $AGAMA_ARTIFACTS_LINUX $CI_COMMIT_REF_NAME/Linux
250-
- mv $VERUS_CLI_MACOS_PORTABLE $AGAMA_ARTIFACTS_MACOS $CI_COMMIT_REF_NAME/MacOS
251-
- echo "$AUTH_KEY" > AUTH_KEY.json
252-
- gcloud auth activate-service-account --key-file AUTH_KEY.json
253-
- gsutil rsync -r $CI_COMMIT_REF_NAME/ $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/
254-
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"
255283

‎Brewfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ brew "automake"
99
brew "binutils"
1010
brew "cmake"
1111
brew "coreutils"
12-
brew "gcc@5"
12+
brew "gcc@6"
1313
brew "leveldb"
1414
brew "nanomsg"
1515
brew "protobuf"

0 commit comments

Comments
 (0)