Updating CI config (#135)

2018-10-16 18:39:33 -07:00
parent 722cd79497
commit 522c4984e0
18 changed files with 111 additions and 532 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,11 +5,16 @@ stages:


 variables:
-  VERSION: 0.4.0
-  VERUS_CLI_LINUX: "Verus-CLI-Linux-v${VERSION}-beta.tar.gz"
-  VERUS_CLI_WINDOWS: "Verus-CLI-Windows-v${VERSION}-beta.zip"
-  VERUS_CLI_MACOS: "Verus-CLI-MacOS-v${VERSION}-beta.tar.gz"
-  POST_COMMENT: "Branch and Commit: ${CI_COMMIT_REF_NAME} ${CI_COMMIT_SHA} $'\n'MD5: "
+  VERSION: 0.4.1
+  VERUS_CLI_LINUX: Verus-CLI-Linux-v${VERSION}.tar.gz
+  VERUS_CLI_WINDOWS: Verus-CLI-Windows-v${VERSION}.zip
+  VERUS_CLI_MACOS: Verus-CLI-MacOS-v${VERSION}.tar.gz
+  DOWNSTREAM_AGAMA_BRANCH: ${CI_COMMIT_REF_NAME}
+  POST_MESSAGE: "Source: ${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}\n
+  Pipeline Trigger: ${CI_PIPELINE_SOURCE}\n
+  Commit: ${CI_COMMIT_SHA}$\n
+  Author:  ${GITLAB_USER_NAME} <${GITLAB_USER_EMAIL}>\n
+  ${CI_COMMIT_MESSAGE}"


 build:linux:
@@ -17,43 +22,42 @@ build:linux:
  variables:
    DOCKER_DRIVER: overlay2
  stage: build
-  before_script: # Setup Cache
-  - rm -rf /root/.ccache || true
-  - mv .ccache /root/ || true
-  script:
-  - zcutil/build.sh -j$(nproc)
-  - cp src/komodod src/komodo-cli kmd/linux/verus-cli
-  - chmod +x kmd/linux/verus-cli/komodod
-  - chmod +x kmd/linux/verus-cli/komodo-cli
-  - chmod +x kmd/linux/verus-cli/verus
-  - chmod +x kmd/linux/verus-cli/verusd
-  - chmod +x kmd/linux/verus-cli/fetch-params
-  - dos2unix kmd/linux/verus-cli/README.txt
-  - cd kmd/linux/
-  - tar -czvf $VERUS_CLI_LINUX verus-cli
-  - mv $VERUS_CLI_LINUX ../..
-  - cd  ../..
-  - export VERUS_CLI_LINUX_MD5=$(md5sum $VERUS_CLI_LINUX | cut -d " " -f 1)
-  - curl -F file=@"$VERUS_CLI_LINUX"
-      -F channels="$CLI_POST_CHANNEL"
-      -F initial_comment="${POST_COMMENT}$VERUS_CLI_LINUX_MD5"
-      -H "${SLACK_BOT_AUTH}"
-      "https://slack.com/api/files.upload"
-  after_script:
-  - mv /root/.ccache ./ || true
  cache:
    key: ${CI_JOB_NAME}
    paths:
    - depends/built
-    - .ccache
+  script:
+  - zcutil/build.sh -j$(nproc)
+  - mkdir verus-cli
+  - cp src/komodod
+    src/komodo-cli
+    src/verus
+    src/verusd
+    doc/man/verus-cli/linux/README.txt
+    zcutil/fetch-params.sh
+    verus-cli
+  - mv verus-cli/fetch-params.sh verus-cli/fetch-params
+  - chmod +x verus-cli/komodod
+  - chmod +x verus-cli/komodo-cli
+  - chmod +x verus-cli/verus
+  - chmod +x verus-cli/verusd
+  - chmod +x verus-cli/fetch-params
+  - tar -czvf ${VERUS_CLI_LINUX} verus-cli
+  - md5sum ${VERUS_CLI_LINUX} > ${VERUS_CLI_LINUX}.md5
+  - curl -F file=@"${VERUS_CLI_LINUX}"
+      -F channels="${CLI_POST_CHANNEL}"
+      -F initial_comment="${POST_MESSAGE}"
+      -H "${SLACK_BOT_AUTH}"
+      "https://slack.com/api/files.upload"
  artifacts:
    paths:
-    - $VERUS_CLI_LINUX
+    - ${VERUS_CLI_LINUX}
+    - ${VERUS_CLI_LINUX}.md5
    expire_in: 1 week


 build:windows:
-  image: asherd/veruscoin-cross-compiler:latest
+  image: asherd/veruscoin-cross-compiler:windows
  variables:
    DOCKER_DRIVER: overlay2
  stage: build
@@ -61,29 +65,27 @@ build:windows:
    key: ${CI_JOB_NAME}
    paths:
    - depends/built
-    - .ccache
-    - .cargo
-  before_script:
-  - mkdir .ccache  || echo ccache exists
-  - ln -s $PWD/.ccache /root/.ccache
-  - mkdir .zcash-params || echo zcash-params exists
-  - mkdir .cargo || echo .cargo exists
-  - ln -s $PWD/.cargo /root/.cargo
  script:
  - zcutil/build-win.sh -j$(nproc)
-  - cp src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe kmd/windows/verus-cli
-  - cd kmd/windows/
-  - zip -r $VERUS_CLI_WINDOWS verus-cli
-  - mv $VERUS_CLI_WINDOWS ../..
-  - cd  ../..
-  - export VERUS_CLI_WINDOWS_MD5=$(md5sum $VERUS_CLI_WINDOWS | cut -d " " -f 1)
-  - curl -F file=@"$VERUS_CLI_WINDOWS"
-      -F channels="$CLI_POST_CHANNEL"
-      -F initial_comment="${POST_COMMENT}$VERUS_CLI_WINDOWS_MD5"
+  - mkdir verus-cli
+  - cp src/komodod.exe
+    src/komodo-cli.exe
+    src/komodo-tx.exe
+    doc/man/verus-cli/windows/README.txt
+    zcutil/fetch-params.bat
+    zcutil/wget64.exe
+    verus-cli
+  - zip -r ${VERUS_CLI_WINDOWS} verus-cli
+  - md5sum ${VERUS_CLI_WINDOWS} > ${VERUS_CLI_WINDOWS}.md5
+  - curl -F file=@"${VERUS_CLI_WINDOWS}"
+      -F channels="${CLI_POST_CHANNEL}"
+      -F initial_comment="${POST_MESSAGE}"
      -H "${SLACK_BOT_AUTH}"
      "https://slack.com/api/files.upload"
  artifacts:
-    paths: [$VERUS_CLI_WINDOWS]
+    paths:
+    - ${VERUS_CLI_WINDOWS}
+    - ${VERUS_CLI_WINDOWS}.md5
    expire_in: 1 week


@@ -96,18 +98,19 @@ build:mac:
    - depends/built
  script:
  - brew bundle
-  - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu) | xcpretty
+  - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu)
  - ./makeReleaseMac.sh
-  - dos2unix kmd/mac/verus-cli/README.txt
-  - tar -C kmd/mac/ -czvf $VERUS_CLI_MACOS verus-cli ./
-  - export VERUS_CLI_MACOS_MD5=$(md5sum $VERUS_CLI_MACOS | cut -d " " -f 1)
-  - curl -F file=@"$VERUS_CLI_MACOS"
-      -F channels="$CLI_POST_CHANNEL"
-      -F initial_comment="${POST_COMMENT}$VERUS_CLI_MACOS_MD5"
+  - tar -czvf ${VERUS_CLI_MACOS} verus-cli
+  - md5sum ${VERUS_CLI_MACOS} > ${VERUS_CLI_MACOS}.md5
+  - curl -F file=@"${VERUS_CLI_MACOS}"
+      -F channels="${CLI_POST_CHANNEL}"
+      -F initial_comment="${POST_MESSAGE}"
      -H "${SLACK_BOT_AUTH}"
      "https://slack.com/api/files.upload"
  artifacts:
-    paths: [$VERUS_CLI_MACOS]
+    paths:
+    - ${VERUS_CLI_MACOS}
+    - ${VERUS_CLI_MACOS}.md5
    expire_in: 1 week


@@ -169,11 +172,11 @@ build:mac:
    DOCKER_DRIVER: overlay2
  stage: test
  before_script:
-  - apt update && apt install -y wget g++-multilib libcurl3 python
+  - apt update && apt install -y wget libgomp1 libcurl3 python
  - rm -rf /root/.komodo || true
  - mv .komodo /root/ || true
  script:
-  - tar -xzvf $VERUS_CLI_LINUX
+  - tar -xzvf ${VERUS_CLI_LINUX}
  - export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
  - python qa/verus-cli-tests/verus-cli-tester.py
  after_script:
@@ -194,11 +197,11 @@ build:mac:
    DOCKER_DRIVER: overlay2
  stage: test
  before_script:
-  - apt update && apt install -y wget g++-multilib libcurl3 python
+  - apt update && apt install -y wget libgomp1 libcurl3 python
  - rm -rf /root/.komodo || true
  - mv .komodo /root/ || true
  script:
-  - tar -xzvf $VERUS_CLI_LINUX
+  - tar -xzvf ${VERUS_CLI_LINUX}
  - export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
  - python qa/verus-cli-tests/verus-cli-tester.py
  after_script:
@@ -213,7 +216,7 @@ build:mac:
  - build:linux


-.osx:sierra: # fetch-params.sh needs to be fixed for MacOS
+.macos:sierra: # fetch-params.sh needs to be fixed for MacOS
  stage: test
  tags: ["Sierra"]
  script:
@@ -227,11 +230,11 @@ build:mac:
  - build:mac


-.osx:high-sierra: # fetch-params.sh needs to be fixed for MacOS
+.macos:high-sierra:
  stage: test
  tags: ["High Sierra"]
  script:
-  - tar -xzvf $VERUS_CLI_MACOS
+  - tar -xzvf ${VERUS_CLI_MACOS}
  - export PATH=$PATH:$CI_PROJECT_DIR/verus-cli
  - python qa/verus-cli-tests/verus-cli-tester.py
  artifacts:
@@ -266,18 +269,18 @@ deploy:
  - build:mac
  script:
  - mkdir Windows && mkdir Linux && mkdir MacOS &&
-    mv $VERUS_CLI_WINDOWS Windows &&
-    mv $VERUS_CLI_LINUX Linux &&
-    mv $VERUS_CLI_MACOS MacOS
+    mv ${VERUS_CLI_WINDOWS} Windows &&
+    mv ${VERUS_CLI_LINUX} Linux &&
+    mv ${VERUS_CLI_MACOS} MacOS
  - echo "$AUTH_KEY" > AUTH_KEY.json &&
    gcloud auth activate-service-account
    --key-file AUTH_KEY.json
  - gsutil cp -r Windows Linux MacOS $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/
  - curl -X POST
      -F token="$CI_JOB_TOKEN"
-      -F ref=dev
-      -F variables\[UPSTREAM_CLI_BRANCH\]="$CI_COMMIT_REF_NAME"
-      -F variables\[VERUS_CLI_LINUX\]="$VERUS_CLI_LINUX"
-      -F variables\[VERUS_CLI_WINDOWS\]="$VERUS_CLI_WINDOWS"
-      -F variables\[VERUS_CLI_MACOS\]="$VERUS_CLI_MACOS"
+      -F ref="$DOWNSTREAM_AGAMA_BRANCH"
+      -F variables\[UPSTREAM_TRIGGER_INFO\]="${POST_MESSAGE}"
+      -F variables\[VERUS_CLI_LINUX\]="${VERUS_CLI_LINUX}"
+      -F variables\[VERUS_CLI_WINDOWS\]="${VERUS_CLI_WINDOWS}"
+      -F variables\[VERUS_CLI_MACOS\]="${VERUS_CLI_MACOS}"
      "https://gitlab.com/api/v4/projects/8018592/trigger/pipeline"