Merge pull request #1839 from skalenetwork/develop_to_3_17_merge

Develop to 3.17.2 merge
skalenetwork · Mar 1, 2024 · 1f45d6a · 1f45d6a
2 parents ecc5124 + 216009a
commit 1f45d6a
Show file tree

Hide file tree

Showing 67 changed files with 1,898 additions and 620 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,11 @@
+## Description
+
+_Please provide a brief summary of your changes here. Replace this comment with your summary._
+
+## Tests
+
+_Describe how you tested the changes made in this pull request. Include specific tests you have added. Replace this comment with your testing methodology._
+
+## Performance Impact
+
+_Describe any potential impact on performance due to your changes. Include any benchmarks you performed, if applicable, and compare the results with and without your changes. Replace this comment with your performance analysis._
diff --git a/.github/workflows/custom_build.yml b/.github/workflows/custom_build.yml
@@ -15,6 +15,14 @@ on:
         description: 'Additional cmake options'
         default: ''
         required: false
+      build_type:
+        description: 'Build type of skaled binary'
+        type: choice
+        required: true
+        options: 
+        - Debug
+        - RelWithDebInfo
+        default: RelWithDebInfo
 
 jobs:
   main_job:
@@ -23,14 +31,16 @@ jobs:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        BUILD_TYPE: ${{ github.event.inputs.build_type }}
     steps:
       - name: update apt
-        run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test; sudo apt-get update
+        run: |
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test || true 
+          sudo apt-get update || true
       - name: install packages
         run: |
           sudo apt-get -y remove libzmq* || true
-          sudo apt-get -y install software-properties-common
-          sudo apt-get -y install gcc-9 g++-9
+          sudo apt-get -y install software-properties-common gcc-9 g++-9 || true
 
       - name: Use g++-9 and gcov-9 by default
         run: |
@@ -74,8 +84,6 @@ jobs:
           rm -rf ./libconsensus || true
           ls -1
           git submodule update --init --recursive 
-      - name: update apt
-        run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test;
 
       - name: Prepare ccache timestamp
         id: ccache_cache_timestamp
@@ -95,18 +103,19 @@ jobs:
           export CC=gcc-9
           export CXX=g++-9
           export TARGET=all
-          export CMAKE_BUILD_TYPE=Debug
+          export CMAKE_BUILD_TYPE=$BUILD_TYPE
+          [[ $CMAKE_BUILD_TYPE = "Debug" ]] && export DEBUG_FLAG=1 || export DEBUG_FLAG=0
           cd deps
           ./clean.sh
           rm -f ./libwebsockets-from-git.tar.gz
-          ./build.sh PARALLEL_COUNT=$(nproc) DEBUG=1
+          ./build.sh PARALLEL_COUNT=$(nproc) DEBUG=$DEBUG_FLAG
           cd ..
       - name: Configure all
         run: |
           export CC=gcc-9
           export CXX=g++-9
           export TARGET=all
-          export CMAKE_BUILD_TYPE=Debug
+          export CMAKE_BUILD_TYPE=$BUILD_TYPE
           mkdir -p build
           cd build
           cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE ${{ github.event.inputs.cmake_options }} ..
@@ -116,7 +125,7 @@ jobs:
           export CC=gcc-9
           export CXX=g++-9
           export TARGET=all
-          export CMAKE_BUILD_TYPE=Debug
+          export CMAKE_BUILD_TYPE=$BUILD_TYPE
           cd build
           make skaled -j$(nproc)
           #echo "Ensure release mode skaled does not have any debug markers"
@@ -127,7 +136,8 @@ jobs:
         run: |
           cp build/skaled/skaled scripts/skale_build/executable/
           export BRANCH=${{ github.event.inputs.branch_name }}
-          export VERSION=${{ github.event.inputs.image_version }}
+          [[ $BUILD_TYPE = "Debug" ]] && export VERSION_SUFFIX=debug || export VERSION_SUFFIX=release
+          export VERSION=${{ github.event.inputs.image_version }}-$VERSION_SUFFIX
           echo "Version $VERSION"
           export RELEASE=true
           bash ./scripts/build_and_publish.sh

diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml
@@ -13,7 +13,7 @@
 
  jobs:
   functional-tests:
-    name: Functional tests
+    name: Functional tests for ${{ inputs.version }}
     runs-on: ubuntu-20.04
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
@@ -24,11 +24,12 @@
       with:
         token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         repository: skalenetwork/skale-ci-integration_tests
+        ref: v3.18.0
         submodules: recursive
     - name: Set up Node 
       uses: actions/[email protected]
       with:
-        node-version: 16
+        node-version: 18
     - name: Install packages
       run: |
         sudo apt-get update
@@ -65,8 +66,8 @@
     - name: skaled+load_python+all
       run: SKALED_PROVIDER=skaled_providers/binary_from_container ./run_tests.sh skaled+load_python+all
 
-    # - name: skaled+load_js+run_angry_cats
-    #   run: SKALED_PROVIDER=skaled_providers/endpoint_by_container ./run_tests.sh skaled+load_js+run_angry_cats
+    - name: skaled+load_js+run_angry_cats
+      run: SKALED_PROVIDER=skaled_providers/endpoint_by_container ./run_tests.sh skaled+load_js+run_angry_cats
 
     - name: skaled+internals+test_snapshot_api
       run: SKALED_PROVIDER=skaled_providers/binary_from_container ./run_tests.sh skaled+internals+test_snapshot_api
@@ -86,11 +87,12 @@
       if: ${{ always() }}
       continue-on-error: true
       with:
-        name: debug
+        name: debug-${{ inputs.version }}
         path: |
           skaled_providers
           !skaled_providers/**/skaled
           /tmp/tmp*
+          /tmp/*log
           *.log
           ./integration_tests/skaled/internals/third_party/skale-node-tests/btrfs
           !**/.env
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,12 +21,13 @@ jobs:
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
     steps:
       - name: update apt
-        run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test; sudo apt-get update
+        run: | 
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test || true
+          sudo apt-get update || true
       - name: install packages
         run: |
           sudo apt-get -y remove libzmq* || true
-          sudo apt-get -y install software-properties-common
-          sudo apt-get -y install gcc-9 g++-9
+          sudo apt-get -y install software-properties-common gcc-9 g++-9 || true
 
       - name: Use g++-9 and gcov-9 by default
         run: |
@@ -150,6 +151,7 @@ jobs:
           export VERSION=$(cat VERSION)
           export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION)
           echo "::set-env name=VERSION::$VERSION"
+          echo "::set-env name=VERSION_ORIG::$VERSION"
           echo "Version $VERSION"
           ( test $BRANCH = "stable" && export PRERELEASE=false ) || export PRERELEASE=true
           echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV
@@ -191,6 +193,7 @@ jobs:
           echo "Branch $BRANCH"
           export VERSION=$VERSION-historic
           echo "::set-env name=VERSION::$VERSION"
+          echo "::set-env name=VERSION_HISTORIC::$VERSION"
           echo "Version $VERSION"
           export RELEASE=true
           echo "::set-env name=RELEASE::$RELEASE"
@@ -214,12 +217,21 @@ jobs:
           asset_name: skaled-debug-historic
           asset_content_type: application/octet-stream
     outputs:
-      version: ${{ env.VERSION }}
+      version_orig: ${{ env.VERSION_ORIG }}
+      version_historic: ${{ env.VERSION_HISTORIC }}
 
   functional-tests:
     uses: ./.github/workflows/functional-tests.yml
-    name: Functional testing for build
+    name: Functional testing for orig build
     needs: [build]
     with:
-      version: ${{ needs.build.outputs.version }}
+      version: ${{ needs.build.outputs.version_orig }}
+    secrets: inherit
+
+  functional-tests-historic:
+    uses: ./.github/workflows/functional-tests.yml
+    name: Functional testing for historic build
+    needs: [build]
+    with:
+      version: ${{ needs.build.outputs.version_historic }}
     secrets: inherit