Merge with develop

nanocurrency · Dec 14, 2020 · c2a04d4 · c2a04d4
2 parents 8410a52 + d35800a
commit c2a04d4
Show file tree

Hide file tree

Showing 122 changed files with 3,836 additions and 2,544 deletions.
diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml
@@ -13,4 +13,20 @@ jobs:
           DEBIAN_FRONTEND: noninteractive
         run: sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-8 1000
       - name: Clang Format
-        run: ci/check-commit-format.sh 
+        run: ci/check-commit-format.sh
+
+  cmake_format:
+    runs-on: ubuntu-18.04
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    steps:
+      - uses: actions/checkout@50fbc62
+      - uses: actions/setup-python@41b7212
+        with: 
+          python-version: '3.x'
+          architecture: 'x64'
+      - uses: BSFishy/pip-action@8f2d471
+        with: 
+          packages: |
+            cmake-format
+      - name: Check cmake-format
+        run: bash ci/check-cmake-format.sh
diff --git a/.github/workflows/beta_artifacts.yml b/.github/workflows/beta_artifacts.yml
@@ -1,89 +1,116 @@
 name: Beta
-
 on:
-  push:
-    tags:
-      - V*RC*
-      - V*DB*
+  workflow_dispatch:
+    inputs:
+      repo:
+        description: "repo"
+        default: "nanocurrency/nano-node"
+        required: true
+      ref:
+        description: "tag to build"
+        default: "develop"
+        required: true
 env:
   BETA: 1
   artifact: 1
-  
+
 jobs:
   osx_job:
-    runs-on: macOS-latest
+    runs-on: macos-latest
+    timeout-minutes: 90
     env:
       BOOST_ROOT: /tmp/boost
     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
+        run: |
+          echo "TAG=${{ github.event.inputs.ref }}" >> $GITHUB_ENV
+      - uses: actions/checkout@5a4ac90
+        with:
+          submodules: "recursive"
+          ref: ${{ github.event.inputs.ref }}
+          repository: ${{ github.event.inputs.repo }}
       - name: Fetch Deps
         run: ci/actions/osx/install_deps.sh
       - name: Build Artifact
-        run: TRAVIS_TAG=${TAG} ci/build-deploy.sh "/tmp/qt/lib/cmake/Qt5";            
+        run: TRAVIS_TAG=${TAG} ci/build-deploy.sh "/tmp/qt/lib/cmake/Qt5";
       - name: Deploy Artifact
         run: ci/actions/deploy.sh
         env:
           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_job:
     runs-on: ubuntu-18.04
+    timeout-minutes: 90
     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
+        run: |
+          echo "TAG=${{ github.event.inputs.ref }}" >> $GITHUB_ENV
+      - uses: actions/checkout@5a4ac90
+        with:
+          submodules: "recursive"
+          ref: ${{ github.event.inputs.ref }}
+          repository: ${{ github.event.inputs.repo }}
       - name: Fetch Deps
+        env:
+          COMPILER: gcc
         run: ci/actions/linux/install_deps.sh
       - name: Build Artifact
-        run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && BETA=1 TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
+        run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && BETA=1 TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5"
       - name: Deploy Artifact
         run: ci/actions/deploy.sh
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: us-east-2   
-      
+          AWS_DEFAULT_REGION: us-east-2
+
   linux_docker_job:
     runs-on: ubuntu-18.04
+    timeout-minutes: 90
     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
+        run: |
+          echo "TAG=${{ github.event.inputs.ref }}" >> $GITHUB_ENV
+      - uses: actions/checkout@5a4ac90
+        with:
+          submodules: "recursive"
+          ref: ${{ github.event.inputs.ref }}
+          repository: ${{ github.event.inputs.repo }}
       - name: Fetch Deps
+        env:
+          COMPILER: gcc
         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 }}
-
+      - name: Login to ghcr.io
+        uses: docker/login-action@adb7347
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GHCR_PAT }}
+      - name: Deploy Docker (ghcr.io)
+        run: ci/actions/linux/ghcr_push.sh
+
   windows_job:
     runs-on: windows-latest
+    timeout-minutes: 90
     steps:
-      - uses: actions/checkout@722adc6
-      - uses: chrislennon/action-aws-cli@f0f8671
       - name: tag
         run: |
-          $TRAVIS_TAG=git describe --tags $GITHUB_SHA
-          echo "::set-env name=TAG::$TRAVIS_TAG"
-      - name: Checkout Submodules
-        run: git submodule update --init --recursive
+          Write-Output "TAG=${{ github.event.inputs.ref }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      - uses: actions/checkout@5a4ac90
+        with:
+          submodules: "recursive"
+          ref: ${{ github.event.inputs.ref }}
+          repository: ${{ github.event.inputs.repo }}
       - name: Fetch Deps
         run: ci/actions/windows/install_deps.ps1
       - name: Build Artifact
         run: ci/actions/windows/build.ps1
-        env: 
+        env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
       - name: Deploy Artifact

diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -8,11 +8,19 @@ jobs:
   linux_job:
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@722adc6
-      - name: Checkout Submodules
-        run: git submodule update --init --recursive
+      - uses: actions/checkout@5a4ac90
+        with:
+          submodules: "recursive"
       - name: Fetch Deps
         run: ci/actions/linux/install_deps.sh
+      - name: Login to ghcr.io
+        uses: docker/login-action@adb7347
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GHCR_PAT }}
+      - name: Deploy Docker (ghcr.io)
+        run: ci/actions/linux/ghcr_push.sh
       - name: Deploy Docker (nanocurrency/nano-env)
         run: ci/actions/linux/deploy-docker.sh
         env:

diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml
@@ -1,88 +1,115 @@
 name: Live
-
 on:
-  push:
-    tags-ignore:
-      - '*RC*'
-      - '*DB*'
+  workflow_dispatch:
+    inputs:
+      repo:
+        description: "repo"
+        default: "nanocurrency/nano-node"
+        required: true
+      ref:
+        description: "tag to build"
+        default: "develop"
+        required: true
 env:
   artifact: 1
 
 jobs:
   osx_job:
-    runs-on: macOS-latest
+    runs-on: macos-latest
+    timeout-minutes: 90
     env:
       BOOST_ROOT: /tmp/boost
     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
+        run: |
+          echo "TAG=${{ github.event.inputs.ref }}" >> $GITHUB_ENV
+      - uses: actions/checkout@5a4ac90
+        with:
+          submodules: "recursive"
+          ref: ${{ github.event.inputs.ref }}
+          repository: ${{ github.event.inputs.repo }}
       - name: Fetch Deps
         run: ci/actions/osx/install_deps.sh
       - name: Build Artifact
-        run: TRAVIS_TAG=${TAG} ci/build-deploy.sh "/tmp/qt/lib/cmake/Qt5";            
+        run: TRAVIS_TAG=${TAG} ci/build-deploy.sh "/tmp/qt/lib/cmake/Qt5";
       - name: Deploy Artifact
         run: ci/actions/deploy.sh
         env:
           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_job:
     runs-on: ubuntu-18.04
+    timeout-minutes: 90
     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
+        run: |
+          echo "TAG=${{ github.event.inputs.ref }}" >> $GITHUB_ENV
+      - uses: actions/checkout@5a4ac90
+        with:
+          submodules: "recursive"
+          ref: ${{ github.event.inputs.ref }}
+          repository: ${{ github.event.inputs.repo }}
       - name: Fetch Deps
+        env:
+          COMPILER: gcc
         run: ci/actions/linux/install_deps.sh
       - name: Build Artifact
-        run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
+        run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5"
       - name: Deploy Artifact
         run: ci/actions/deploy.sh
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: us-east-2     
+          AWS_DEFAULT_REGION: us-east-2
 
   linux_docker_job:
     runs-on: ubuntu-18.04
+    timeout-minutes: 90
     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
+        run: |
+          echo "TAG=${{ github.event.inputs.ref }}" >> $GITHUB_ENV
+      - uses: actions/checkout@5a4ac90
+        with:
+          submodules: "recursive"
+          ref: ${{ github.event.inputs.ref }}
+          repository: ${{ github.event.inputs.repo }}
       - name: Fetch Deps
+        env:
+          COMPILER: gcc
         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 }}
-
+      - name: Login to ghcr.io
+        uses: docker/login-action@adb7347
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GHCR_PAT }}
+      - name: Deploy Docker (ghcr.io
+        run: ci/actions/linux/ghcr_push.sh
+
   windows_job:
     runs-on: windows-latest
+    timeout-minutes: 90
     steps:
-      - uses: actions/checkout@722adc6
-      - uses: chrislennon/action-aws-cli@f0f8671
       - name: tag
         run: |
-          $TRAVIS_TAG=git describe --tags $GITHUB_SHA
-          echo "::set-env name=TAG::$TRAVIS_TAG"
-      - name: Checkout Submodules
-        run: git submodule update --init --recursive
+          Write-Output "TAG=${{ github.event.inputs.ref }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      - uses: actions/checkout@5a4ac90
+        with:
+          submodules: "recursive"
+          ref: ${{ github.event.inputs.ref }}
+          repository: ${{ github.event.inputs.repo }}
       - name: Fetch Deps
         run: ci/actions/windows/install_deps.ps1
       - name: Build Artifact
         run: ci/actions/windows/build.ps1
-        env: 
+        env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
       - name: Deploy Artifact