Merge with develop

nanocurrency · Mar 11, 2020 · 21e599a · 21e599a
2 parents efd5131 + 7f72882
commit 21e599a
Show file tree

Hide file tree

Showing 121 changed files with 7,814 additions and 4,261 deletions.
diff --git a/.github/workflows/beta_artifacts.yml b/.github/workflows/beta_artifacts.yml
@@ -51,10 +51,22 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2   
+
+  linux_docker_job:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@722adc6
+      - uses: chrislennon/action-aws-cli@f0f8671
+      - name: tag
+        run: echo "::set-env name=TAG::`git describe --tags $GITHUB_SHA`"
+      - name: Checkout Submodules
+        run: git submodule update --init --recursive
+      - name: Fetch Deps
+        run: ci/actions/linux/install_deps.sh
       - name: Deploy Docker (nanocurrency/nano-beta)
         run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
         env:
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}     
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
   windows_job:
     runs-on: windows-latest

diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml
@@ -50,10 +50,22 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-2     
+
+  linux_docker_job:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@722adc6
+      - uses: chrislennon/action-aws-cli@f0f8671
+      - name: tag
+        run: echo "::set-env name=TAG::`git describe --tags $GITHUB_SHA`"
+      - name: Checkout Submodules
+        run: git submodule update --init --recursive
+      - name: Fetch Deps
+        run: ci/actions/linux/install_deps.sh
       - name: Deploy Docker (nanocurrency/nano)
         run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
         env:
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}   
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
   windows_job:
     runs-on: windows-latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,13 +1,19 @@
 cmake_minimum_required (VERSION 3.4)
 
-if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12")
+if (CMAKE_VERSION VERSION_GREATER 3.12 OR CMAKE_VERSION VERSION_EQUAL 3.12)
 	#find_package uses <PACKAGENAME>_ROOT variables
 	cmake_policy(SET CMP0074 NEW)
 endif()
-if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13")
+if (CMAKE_VERSION VERSION_GREATER 3.13 OR CMAKE_VERSION VERSION_EQUAL 3.13)
 	#option honors normal variables
 	cmake_policy(SET CMP0077 NEW)
 endif()
+
+if (CMAKE_VERSION VERSION_LESS 3.11)
+	# compatibility for boost import targets use bundled 3.11 FindBoost.cmake
+	list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/legacyModules")
+endif ()
+
 # compatibility for osx sierra and on
 # needs to be set before project
 set (CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "")

diff --git a/ci/actions/deploy.sh b/ci/actions/deploy.sh
@@ -12,7 +12,11 @@ else
 fi
 
 if [[ "$OS" == 'Linux' ]]; then
+    sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Linux.tar.bz2 | cut -f1 -d' ' > $GITHUB_WORKSPACE/build/nano-node-$TAG-Linux.tar.bz2.sha256
     aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Linux.tar.bz2 s3://repo.nano.org/$BUILD/binaries/nano-node-$TAG-Linux.tar.bz2 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-$TAG-Linux.tar.bz2.sha256 s3://repo.nano.org/$BUILD/binaries/nano-node-$TAG-Linux.tar.bz2.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
 else
+    sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Darwin.dmg | cut -f1 -d' ' > $GITHUB_WORKSPACE/build/nano-node-$TAG-Darwin.dmg.sha256
     aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Darwin.dmg s3://repo.nano.org/$BUILD/binaries/nano-node-$TAG-Darwin.dmg --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+    aws s3 cp $GITHUB_WORKSPACE/build/nano-node-$TAG-Darwin.dmg.sha256 s3://repo.nano.org/$BUILD/binaries/nano-node-$TAG-Darwin.dmg.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
 fi
diff --git a/ci/actions/windows/build.ps1 b/ci/actions/windows/build.ps1
@@ -4,7 +4,8 @@ if (${env:artifact} -eq 1) {
     if ( ${env:BETA} -eq 1 ) {
         $env:NETWORK_CFG = "beta"
         $env:BUILD_TYPE = "RelWithDebInfo"
-    } else {
+    }
+    else {
         $env:NETWORK_CFG = "live"
         $env:BUILD_TYPE = "Release"
     }
@@ -14,11 +15,13 @@ if (${env:artifact} -eq 1) {
 
     $env:CI = "-DCI_BUILD=ON"
     $env:RUN = "artifact"
-} else {
+}
+else {
     if ( ${env:RELEASE} -eq 1 ) {
         $env:BUILD_TYPE = "RelWithDebInfo"
         $env:ROCKS_LIB = '-DROCKSDB_LIBRARIES="c:\vcpkg\installed\x64-windows-static\lib\rocksdb.lib"'
-    } else { 
+    }
+    else { 
         $env:BUILD_TYPE = "Debug"
         $env:ROCKS_LIB = '-DROCKSDB_LIBRARIES="c:\vcpkg\installed\x64-windows-static\debug\lib\rocksdbd.lib"'
     }

diff --git a/ci/actions/windows/deploy.ps1 b/ci/actions/windows/deploy.ps1
@@ -1,12 +1,19 @@
 $ErrorActionPreference = "Continue"
 
 if ( ${env:BETA} -eq 1 ) {
-    $network_cfg="beta"
-} else {
-    $network_cfg="live"
+    $network_cfg = "beta"
 }
+else {
+    $network_cfg = "live"
+}
+
+$exe = Resolve-Path -Path $env:GITHUB_WORKSPACE\build\nano-node-*-win64.exe
+$zip = Resolve-Path -Path $env:GITHUB_WORKSPACE\build\nano-node-*-win64.zip
+
+(Get-FileHash $exe).hash | Out-file -FilePath "$exe.sh256"
+(Get-FileHash $zip).hash | Out-file -FilePath "$zip.sh256"
 
-$exe=Resolve-Path -Path $env:GITHUB_WORKSPACE\build\nano-node-*-win64.exe
-$zip=Resolve-Path -Path $env:GITHUB_WORKSPACE\build\nano-node-*-win64.zip
 aws s3 cp $exe s3://repo.nano.org/$network_cfg/binaries/nano-node-$env:TAG-win64.exe --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
-aws s3 cp "$zip" s3://repo.nano.org/$network_cfg/binaries/nano-node-$env:TAG-win64.zip --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+aws s3 cp "$exe.sha256" s3://repo.nano.org/$network_cfg/binaries/nano-node-$env:TAG-win64.exe.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+aws s3 cp "$zip" s3://repo.nano.org/$network_cfg/binaries/nano-node-$env:TAG-win64.zip --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+aws s3 cp "$zip.sha256" s3://repo.nano.org/$network_cfg/binaries/nano-node-$env:TAG-win64.zip.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
diff --git a/ci/actions/windows/install_deps.ps1 b/ci/actions/windows/install_deps.ps1
@@ -51,8 +51,8 @@ function Get-RedirectedUri {
 
 $qt5_root = "c:\qt"
 $rocksdb_url = Get-RedirectedUri "https://repo.nano.org/artifacts/rocksdb-msvc14.1-latest.7z"
-$qt5base_url = Get-RedirectedUri "https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5131/qt.qt5.5131.win64_msvc2017_64/5.13.1-0-201909031231qtbase-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z"
-$qt5winextra_url = Get-RedirectedUri "https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5131/qt.qt5.5131.win64_msvc2017_64/5.13.1-0-201909031231qtwinextras-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z"
+$qt5base_url = Get-RedirectedUri "https://repo.nano.org/artifacts/5.13.1-0-201909031231qtbase-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z"
+$qt5winextra_url = Get-RedirectedUri "https://repo.nano.org/artifacts/5.13.1-0-201909031231qtwinextras-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z"
 $rocksdb_artifact = "${env:TMP}\rocksdb.7z"
 $qt5base_artifact = "${env:TMP}\qt5base.7z"
 $qt5winextra_artifact = "${env:TMP}\qt5winextra.7z"