Merge pull request #12 from KomodoPlatform/dev

Dev
MercerWeissAlt · Dec 19, 2019 · 7070c98 · 7070c98
2 parents 9d10839 + 7b8ee9e
commit 7070c98
Show file tree

Hide file tree

Showing 224 changed files with 15,886 additions and 4,352 deletions.
diff --git a/.github/workflows/komodod_ci.yml b/.github/workflows/komodod_ci.yml
@@ -0,0 +1,94 @@
+name: CI test
+
+on: [push, pull_request]
+
+jobs:
+  ci:
+    name: ${{ matrix.os }} CI
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macOS-latest, ubuntu-18.04]
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Install deps (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get remove php7.1-fpm php7.2-fpm php7.3-fpm
+          sudo apt-get update
+          sudo apt-get upgrade -y
+          sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool libncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libboost-all-dev libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev ntp ntpdate nano software-properties-common curl libevent-dev libcurl4-gnutls-dev cmake clang libsodium-dev -y
+          sudo apt-get install python3.6 python3-pip python3-setuptools libgnutls28-dev
+          pip3 install setuptools wheel
+          pip3 install slick-bitcoinrpc pytest wget
+          # params we will need for tests execution
+          ./zcutil/fetch-params.sh
+      
+      - name: Build (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!!
+          CONFIGURE_FLAGS='CPPFLAGS=-DTESTMODE' ./zcutil/build.sh -j$(nproc)
+#       - name: Install deps (macOS)
+#         if: runner.os == 'macOS'
+#         run: |
+#           brew update
+#           brew upgrade
+#           brew tap discoteq/discoteq; brew install flock
+#           brew install autoconf autogen automake
+#           brew install gcc@8
+#           brew install binutils
+#           brew install protobuf
+#           brew install coreutils
+#           brew install wget
+#           brew install python3
+#           pip3 install setuptools wheel slick-bitcoinrpc pytest wget
+#           ./zcutil/fetch-params.sh
+
+#       - name: Build (macOS)
+#         if: runner.os == 'macOS'
+#         run: |
+#           # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!!
+#           export CPATH=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/
+#           CONFIGURE_FLAGS='CPPFLAGS=-DTESTMODE' ./zcutil/build-mac.sh -j4
+#       - name: Run CC tests
+#         if: runner.os == 'Linux' || runner.os == 'macOS'
+      - name: Run CC tests
+        if: runner.os == 'Linux'
+        run: |
+          cd qa/rpc-tests/cc_pytest
+          ./ci_setup.sh
+
+  job-win-build:
+
+    name: Win Build
+    runs-on: ubuntu-16.04
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Build Win on Unix
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      if: runner.os == 'Linux'
+      run: |
+        sudo apt-get remove php5.6-fpm php7.0-fpm php7.1-fpm php7.2-fpm php7.3-fpm
+        sudo apt-get update
+        sudo apt-get upgrade -y
+        sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool libncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libboost-all-dev libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev ntp ntpdate nano software-properties-common curl libevent-dev libcurl4-gnutls-dev cmake clang libsodium-dev -y
+        sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python python-zmq zlib1g-dev wget libcurl4-gnutls-dev bsdmainutils automake curl cmake mingw-w64
+        curl https://sh.rustup.rs -sSf | sh -s -- -y
+        source $HOME/.cargo/env
+        rustup target add x86_64-pc-windows-gnu
+        sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
+        sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
+        ./zcutil/build-win.sh -j 2
+    - name: Upload komodod.exe as artifact
+      uses: actions/upload-artifact@v1
+      with:
+        name: komodod.exe
+        path: ./src/komodod.exe
+
+  #TODO: windows tests 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -46,6 +46,10 @@ build:ubuntu:
   - chmod +x ${PACKAGE_DIR_LINUX}/komodo-cli
   - tar -czvf ${AGAMA_ARTIFACTS_LINUX} ${PACKAGE_DIR_LINUX}
   - md5sum ${AGAMA_ARTIFACTS_LINUX} > ${AGAMA_ARTIFACTS_LINUX_CHECKSUM}
+  only:
+  - master
+  - beta
+  - dev
   artifacts:
     paths:
     - ${AGAMA_ARTIFACTS_LINUX}
@@ -77,6 +81,10 @@ build:windows:
     ${PACKAGE_DIR_WINDOWS}
   - zip -r ${PACKAGE_DIR_WINDOWS}.zip ${PACKAGE_DIR_WINDOWS}
   - md5sum ${AGAMA_ARTIFACTS_WINDOWS} > ${AGAMA_ARTIFACTS_WINDOWS_CHECKSUM}
+  only:
+  - master
+  - beta
+  - dev
   artifacts:
     paths:
     - ${AGAMA_ARTIFACTS_WINDOWS}
@@ -89,17 +97,28 @@ build:windows:
 ########################################################################################################################
 build:macos:
   stage: build
-  tags: ["High Sierra"]
+  tags: 
+  - osx
   cache:
     key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
     paths:
     - depends/built
   allow_failure: true
   script:
   - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu)
-  - ./makeRelease.sh ${PACKAGE_DIR_MACOS}
+  - mkdir ${PACKAGE_DIR_MACOS}
+  - cp src/komodod
+    src/komodo-cli
+    zcutil/fetch-params.sh
+    ${PACKAGE_DIR_MACOS}
+  - chmod +x ${PACKAGE_DIR_MACOS}/komodod
+  - chmod +x ${PACKAGE_DIR_MACOS}/komodo-cli
   - tar -czvf ${AGAMA_ARTIFACTS_MACOS} ${PACKAGE_DIR_MACOS}
   - md5sum ${AGAMA_ARTIFACTS_MACOS} > ${AGAMA_ARTIFACTS_MACOS_CHECKSUM}
+  only:
+  - master
+  - beta
+  - dev
   artifacts:
     paths:
     - ${AGAMA_ARTIFACTS_MACOS}

diff --git a/.travis.yml b/.travis.yml
@@ -5,10 +5,7 @@ matrix:
     - os: linux
       dist: xenial
       sudo: required
-      env: LINUX_DEPLOY="true" OSX_DEPLOY="false" $TRAVIS_OS_NAME="linux"
-    - os: osx
-      osx_image: xcode8
-      env: OSX_DEPLOY="true" LINUX_DEPLOY="false" $TRAVIS_OS_NAME="osx"
+      env: LINUX_DEPLOY="false" OSX_DEPLOY="false" $TRAVIS_OS_NAME="linux"
 branches:
   only:
     - master

diff --git a/LEGAL/AUTHORS b/LEGAL/AUTHORS
@@ -0,0 +1,2 @@
+jl777 https://github.com/jl777
+