Merge commit '8b7bf017a605f3ef5f500a09db5296314f1df346' into dev/etan…

…/ci-timeouts

* commit '8b7bf017a605f3ef5f500a09db5296314f1df346':
  fix CI archive step (#3752)
  Support displaying the version number in the status bar; Implements #2959 (#3747)
  ci: install cmake on windows in daily job
  Version 22.5.2
  change proposer boost to 40%
  bump merge-testnets to get new ropsten TTD (#3668)

.github/workflows/cron.yml

@@ -83,6 +83,7 @@ jobs:
             base-devel
             git
             mingw-w64-i686-toolchain
+            mingw-w64-i686-cmake
 
       - name: MSYS2 (Windows amd64)
         if: runner.os == 'Windows' && matrix.target.cpu == 'amd64'
@@ -93,6 +94,7 @@ jobs:
             base-devel
             git
             mingw-w64-x86_64-toolchain
+            mingw-w64-x86_64-cmake
 
       - name: Restore Nim DLLs dependencies (Windows) from cache
         if: runner.os == 'Windows'
@@ -147,6 +149,7 @@ jobs:
           fi
 
           ncpu=""
+          make_cmd="make"
           case '${{ runner.os }}' in
           'Linux')
             ncpu=$(nproc)
@@ -156,14 +159,16 @@ jobs:
             ;;
           'Windows')
             ncpu=${NUMBER_OF_PROCESSORS}
+            make_cmd="mingw32-make"
             ;;
           esac
           [[ -z "$ncpu" || $ncpu -le 0 ]] && ncpu=1
           echo "ncpu=${ncpu}" >> $GITHUB_ENV
+          echo "make_cmd=${make_cmd}" >> $GITHUB_ENV
 
       - name: Build Nim and Nimbus dependencies
         run: |
-          make -j ${ncpu} NIM_COMMIT=${{ matrix.branch }} ARCH_OVERRIDE=${PLATFORM} QUICK_AND_DIRTY_COMPILER=1 update
+          ${make_cmd} -j ${ncpu} NIM_COMMIT=${{ matrix.branch }} ARCH_OVERRIDE=${PLATFORM} QUICK_AND_DIRTY_COMPILER=1 update
           ./env.sh nim --version
 
       - name: Get latest fixtures commit hash
@@ -188,10 +193,10 @@ jobs:
 
       - name: Build all tools
         run: |
-          make -j ${ncpu} V=1 NIM_COMMIT=${{ matrix.branch }}
+          ${make_cmd} -j ${ncpu} V=1 NIM_COMMIT=${{ matrix.branch }}
           # The Windows image runs out of disk space, so make some room
           rm -rf nimcache
 
       - name: Run tests
         run: |
-          make -j ${ncpu} V=1 NIM_COMMIT=${{ matrix.branch }} DISABLE_TEST_FIXTURES_SCRIPT=1 test
+          ${make_cmd} -j ${ncpu} V=1 NIM_COMMIT=${{ matrix.branch }} DISABLE_TEST_FIXTURES_SCRIPT=1 test

CHANGELOG.md

@@ -1,3 +1,16 @@
+2022-05-30 v22.5.2
+==================
+
+Nimbus `v22.5.2` is a `low-urgency` maintenance release updating Ropsten testnet support.
+
+### Fixes:
+
+* Modify proposer boost from 70% to 40% to improve network consensus
+  https://github.com/status-im/nimbus-eth2/commit/14dc3855f6cd06579294322a6ed206f678c8530f
+
+* Update Ropsten TTD to a large enough number it can't be readily triggered by mining
+  https://github.com/status-im/nimbus-eth2/pull/3668
+
 2022-05-20 v22.5.1
 ==================
 

Jenkinsfile

@@ -74,7 +74,7 @@ def runStages(nodeDir) {
 			// archive testnet logs
 			sh """#!/bin/bash
 			for D in local_testnet0_data local_testnet1_data resttest0_data; do
-				[[ -d "\$D" ]] && tar czf "\${D}-\${NODE_NAME}.tar.gz "\${D}"/*.txt || true
+				[[ -d "\$D" ]] && tar czf "\${D}-\${NODE_NAME}.tar.gz" "\${D}"/*.txt || true
 			done
 			"""
 			try {

beacon_chain/nimbus_beacon_node.nim

@@ -1568,6 +1568,12 @@ when not defined(windows):
       # The status bar feature would allow the user to specify an
       # arbitrary expression that is resolvable through this API.
       case expr.toLowerAscii
+      of "version":
+        versionAsStr
+
+      of "full_version":
+        fullVersionStr
+
       of "connected_peers":
         $(node.connectedPeersCount)
 

beacon_chain/version.nim

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2021 Status Research & Development GmbH
+# Copyright (c) 2018-2022 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -15,7 +15,7 @@ when not defined(nimscript):
 const
   versionMajor* = 22
   versionMinor* = 5
-  versionBuild* = 1
+  versionBuild* = 2
 
   versionBlob* = "stateofus" # Single word - ends up in the default graffiti