Merge branch 'eager_electron_5.3RC' into mainnet_5.3RC

Author: echoby

.github/workflows/boost_build.yml

@@ -1,4 +1,4 @@
-name: Build
+name: Build Boost
 on:
   push:
     tags:
@@ -9,8 +9,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # os: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04]
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04]
 
     steps:
       - name: Create Build Environment
@@ -19,13 +18,12 @@ jobs:
           mkdir ${{runner.workspace}}/boost_prebuild
           sudo apt-get update
 
-      # - name: Create Build Environment [ubuntu 16.04]
-      #   shell: bash
-      #   if: matrix.os == 'ubuntu-16.04'
-      #   run: |
-      #     sudo apt-get install g++-7 gcc-7
-      #     echo "CC=gcc-7" >> $GITHUB_ENV
-      #     echo "CXX=g++-7" >> $GITHUB_ENV
+      - name: Create Build Environment [ubuntu 16.04]
+        shell: bash
+        if: matrix.os == 'ubuntu-16.04'
+        run: |
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
+          sudo update-alternatives --set gcc "/usr/bin/gcc-9"
 
       - name: Download
         shell: bash
@@ -40,16 +38,8 @@ jobs:
           cd ${{runner.workspace}}/boost
           ./bootstrap.sh
 
-      # - name: Build [ubuntu 16.04]
-      #   shell: bash
-      #   if: matrix.os == 'ubuntu-16.04'
-      #   run: |
-      #     cd ${{runner.workspace}}/boost
-      #     ./b2 --target=static --toolset=gcc-7
-
-      - name: Build [ubuntu 18.04 && ubuntu 20.04]
+      - name: Build
         shell: bash
-        if: matrix.os != 'ubuntu-16.04'
         run: |
           cd ${{runner.workspace}}/boost
           ./b2 --target=static

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15, ubuntu-18.04, ubuntu-20.04, windows-2019]
+        os: [macos-10.15, ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, windows-2019]
 
     steps:
     - uses: actions/checkout@v2
@@ -33,10 +33,17 @@ jobs:
 
     - name: Create Build Environment [ununtu all]
       shell: bash
-      if: matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
+      if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
       run: |
         sudo apt-get update
         sudo apt-get install libssl-dev curl libxi-dev libcups2-dev -y
+      
+    - name: Create Build Environment [ubuntu 16.04]
+      shell: bash
+      if: matrix.os == 'ubuntu-16.04'
+      run: |
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
+        sudo update-alternatives --set gcc "/usr/bin/gcc-9"
 
     - name: Create Build Environment [windows]
       shell: bash
@@ -53,7 +60,7 @@ jobs:
 
     - name: Download boost [ununtu all]
       shell: bash
-      if: matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
+      if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
       run: |
         git clone https://github.com/BeamMW/boost_prebuild_${{matrix.os}}.git ${{runner.workspace}}/boost_prebuild
         echo "BOOST_INCLUDEDIR=${{runner.workspace}}/boost_prebuild/include" >> $GITHUB_ENV
@@ -91,7 +98,7 @@ jobs:
 
     - name: Build [ununtu all]
       shell: bash
-      if: matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
+      if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
       run: make -j$(nproc)
 
     - name: Build [windows]
@@ -108,7 +115,7 @@ jobs:
       run: ctest -C $BUILD_TYPE --verbose
 
     - name: Test [ununtu all]
-      if: matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
+      if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
       continue-on-error: false
       shell: bash
       run: ctest --verbose
@@ -207,7 +214,7 @@ jobs:
 
     - name: OS name [ununtu all]
       shell: bash
-      if: matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
+      if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
       run: echo "OS_NAME=${{matrix.os}}" >> $GITHUB_ENV
 
     - name: OS name [windows]
@@ -258,35 +265,35 @@ jobs:
 # Upload linux-prefix
 ###############################################################################
     - uses: actions/upload-artifact@v2
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-16.04'
       with:
         name: linux-beam-node${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
         path: artifacts/beam-node*
         if-no-files-found: error
 
     - uses: actions/upload-artifact@v2
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-16.04'
       with:
         name: linux-beam-wallet-cli${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
         path: artifacts/beam-wallet*
         if-no-files-found: error
 
     - uses: actions/upload-artifact@v2
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-16.04'
       with:
         name: linux-wallet-api${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
         path: artifacts/wallet-api*
         if-no-files-found: error
 
     - uses: actions/upload-artifact@v2
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-16.04'
       with:
         name: linux-explorer-node${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
         path: artifacts/explorer-node*
         if-no-files-found: error
 
     - uses: actions/upload-artifact@v2
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-16.04'
       with:
         name: linux-broadcaster${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
         path: artifacts/broadcaster*