Merge branch 'Asher-Dev' into master

VerusCoin · Jul 4, 2018 · c247175 · c247175
2 parents 1a93195 + ea3bc85
commit c247175
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 4,614 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,114 @@
+stages:
+  - build
+  - deploy
+variables:
+  DOCKER_DRIVER: overlay2
+  AGAMA_VERSION: $(sed -nE 's/^\s*"version": "(.*?)",$/\1/p' package.json)
+  PKG_VERSION: $AGAMA_VERSION-beta
+  EASYDEX_GUI_ARTIFACT: build.tar.gz
+  AGAMA_ARTIFACTS_LINUX: linux64.tar.gz
+  AGAMA_ARTIFACTS_MACOS: osx.tar.gz
+  AGAMA_ARTIFACTS_WINDOWS: win64.zip
+  ELECTRON_BUILD_LINUX: Agama-linux-x64
+  ELECTRON_BUILD_WINDOWS: Agama-win32-x64
+  ELECTRON_BUILD_OSX: Agama-darwin-x64
+  AGAMA_LINUX_PORTABLE: ${ELECTRON_BUILD_LINUX}-v${AGAMA_VERSION}-beta.tar.gz
+  AGAMA_WINDOWS_PORTABLE: ${ELECTRON_BUILD_WINDOWS}-v${AGAMA_VERSION}-beta.zip
+  AGAMA_OSX_PORTABLE: ${ELECTRON_BUILD_OSX}-v${AGAMA_VERSION}-beta.tar.gz
+  GIT_SUBMODULE_STRATEGY: recursive
+
+build:linux:
+  image: asherd/agama-builder
+  stage: build
+  before_script:
+    - 'echo "$AUTH_KEY" > AUTH_KEY.json'
+    - "gcloud auth activate-service-account --key-file AUTH_KEY.json"
+    - "gsutil cp $STAGING/EasyDEX-GUI/$CI_COMMIT_REF_NAME/$EASYDEX_GUI_ARTIFACT ."
+    - "tar -xzf $EASYDEX_GUI_ARTIFACT --directory gui/EasyDEX-GUI/react"
+    - "rm $EASYDEX_GUI_ARTIFACT"
+    - "gsutil cp $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/Linux/$AGAMA_ARTIFACTS_LINUX ."
+    - "mkdir -p assets/bin/"
+    - "tar -xzf $AGAMA_ARTIFACTS_LINUX --directory  assets/bin/ && ls assets/bin"
+    - "rm $AGAMA_ARTIFACTS_LINUX"
+
+
+  script: 
+    - "npm install electron-packager -g"
+    - "npm install electron -g --unsafe-perm=true"
+    - "npm install"
+    - "./buildscripts/electron-build-linux.sh"
+    - "cd build"
+    - "tar -czf $AGAMA_LINUX_PORTABLE $ELECTRON_BUILD_LINUX"
+    - "mv $AGAMA_LINUX_PORTABLE .."
+  artifacts:
+    paths:
+    - $AGAMA_LINUX_PORTABLE
+    expire_in: 1 week
+
+build:windows:
+  stage: build
+  image: asherd/agama-builder
+  before_script:
+    - 'echo "$AUTH_KEY" > AUTH_KEY.json'
+    - "gcloud auth activate-service-account --key-file AUTH_KEY.json"
+    - "gsutil cp $STAGING/EasyDEX-GUI/$CI_COMMIT_REF_NAME/$EASYDEX_GUI_ARTIFACT ."
+    - "tar -xzf $EASYDEX_GUI_ARTIFACT --directory gui/EasyDEX-GUI/react"
+    - "rm $EASYDEX_GUI_ARTIFACT"
+    - "gsutil cp $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/Windows/$AGAMA_ARTIFACTS_WINDOWS ."
+    - "mkdir -p assets/bin/"
+    - "unzip $AGAMA_ARTIFACTS_WINDOWS -d assets/bin/ && ls assets/bin "
+    - "rm $AGAMA_ARTIFACTS_WINDOWS"
+    - "./binary_artifacts_win.sh"
+
+  script:
+    - "npm install electron-packager -g"
+    - "npm install electron -g --unsafe-perm=true"
+    - "npm install"
+    - "./buildscripts/electron-build-windows.sh"
+    - "cd build"
+    - "zip -r $AGAMA_WINDOWS_PORTABLE $ELECTRON_BUILD_WINDOWS"
+    - "mv $AGAMA_WINDOWS_PORTABLE .."
+  artifacts:
+    paths:
+    - $AGAMA_WINDOWS_PORTABLE
+    expire_in: 1 week
+
+build:mac:
+  stage: build
+  image: asherd/agama-builder
+  before_script:
+    - 'echo "$AUTH_KEY" > AUTH_KEY.json'
+    - "gcloud auth activate-service-account --key-file AUTH_KEY.json"
+    - "gsutil cp $STAGING/EasyDEX-GUI/$CI_COMMIT_REF_NAME/$EASYDEX_GUI_ARTIFACT ."
+    - "tar -xzf $EASYDEX_GUI_ARTIFACT --directory gui/EasyDEX-GUI/react"
+    - "rm $EASYDEX_GUI_ARTIFACT"
+    - "gsutil cp $STAGING/VerusCoin/$CI_COMMIT_REF_NAME/MacOS/$AGAMA_ARTIFACTS_MACOS ."
+    - "mkdir -p assets/bin/"
+    - "tar -xzf $AGAMA_ARTIFACTS_MACOS --directory  assets/bin/ "
+    - "rm $AGAMA_ARTIFACTS_MACOS"
+
+  script: 
+    - "npm install electron-packager -g"
+    - "npm install electron -g --unsafe-perm=true"
+    - "npm install"
+    - "./buildscripts/electron-build-osx.sh"
+    - "builder build buildscripts/AgamaApp-osx.xml echo"
+    - "cd build"
+    - "tar -czf $AGAMA_OSX_PORTABLE $ELECTRON_BUILD_OSX"
+    - "mv $AGAMA_OSX_PORTABLE .."
+  artifacts:
+    paths:
+    - $AGAMA_OSX_PORTABLE
+    expire_in: 1 week
+
+deploy:
+  stage: deploy
+  image: google/cloud-sdk:alpine
+  dependencies:
+  - build:linux
+  - build:windows
+  - build:mac
+  script:
+  - 'echo "$AUTH_KEY" > AUTH_KEY.json'
+  - "gcloud auth activate-service-account --key-file AUTH_KEY.json"
+  - "gsutil cp $AGAMA_LINUX_PORTABLE $AGAMA_OSX_PORTABLE $AGAMA_WINDOWS_PORTABLE gs://$BUCKET/GitLab/Agama/$CI_COMMIT_REF_NAME/"
diff --git a/.travis.yml b/.travis.yml
@@ -70,7 +70,9 @@ script:
 - if [ "$MOD_PERMISSIONS" = "true" ]; then chmod +x build/$BUILD_DIR/Agama; fi
 after_script:
 - cd build 
+
 - if [ "$BUILD_VARIANT" = "win64" ]; then zip -r $BUILD_DIR-v${AGAMA_VERSION} $BUILD_DIR &&
+
   gsutil cp $BUILD_DIR-v${AGAMA_VERSION}.zip gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi
 - if [ "$BUILD_VARIANT" = "linux64" ]; then cd .. && node make-deb && cd build && ls &&
   gsutil cp agama-app_${PKG_VERSION}_amd64.deb gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi

diff --git a/assets/BitRock Installer Files/IgaunaApp-Linux.xml b/assets/BitRock Installer Files/IgaunaApp-Linux.xml
@@ -1,7 +1,7 @@
 <project>
     <shortName>AgamaApp</shortName>
     <fullName>Agama</fullName>
-    <version>0.3.3</version>
+    <version>${PKG_VERSION}</version>
     <licenseFile>../../LICENSE</licenseFile>
     <leftImage>../installer_imgs/Agama_installer_wizard_image.png</leftImage>
     <logoImage>../installer_imgs/supernet-agama-logo.png</logoImage>

diff --git a/assets/BitRock Installer Files/IgaunaApp-OSX.xml b/assets/BitRock Installer Files/IgaunaApp-OSX.xml
@@ -1,7 +1,7 @@
 <project>
     <shortName>AgamaApp</shortName>
     <fullName>Agama</fullName>
-    <version>0.3.3</version>
+    <version>${PKG_VERSION}</version>
     <licenseFile>../../LICENSE</licenseFile>
     <leftImage>../installer_imgs/Agama_installer_wizard_image.png</leftImage>
     <logoImage>../installer_imgs/supernet-agama-logo.png</logoImage>

diff --git a/assets/BitRock Installer Files/IgaunaApp-Win.xml b/assets/BitRock Installer Files/IgaunaApp-Win.xml
@@ -1,7 +1,7 @@
 <project>
     <shortName>AgamaApp</shortName>
     <fullName>Agama</fullName>
-    <version>0.3.3</version>
+    <version>${PKG_VERSION}</version>
     <licenseFile>../../LICENSE</licenseFile>
     <leftImage>../installer_imgs/Agama_installer_wizard_image.png</leftImage>
     <logoImage>../installer_imgs/supernet-agama-logo.png</logoImage>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "agama-app",
   "productName": "Agama",
-  "version": "0.3.8-beta",
+  "version": "0.3.10",
   "description": "Agama Wallet Desktop App",
   "main": "main.js",
   "scripts": {
@@ -23,7 +23,8 @@
     "wallet",
     "spv",
     "jumblr",
-    "VRSC"
+    "VRSC",
+    "veruscoin"
   ],
   "author": "VerusCoin",
   "license": "MIT",