Merge pull request #2755 from rsksmart/vovchyk/master-rskip351+rskip1…

…44-merge master -> rskip351+rskip144 merge
rsksmart · Sep 26, 2024 · ebc5664 · ebc5664
2 parents 3850591 + ecbb0ad
commit ebc5664
Show file tree

Hide file tree

Showing 145 changed files with 5,454 additions and 1,931 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -13,36 +13,33 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container:
-      image: openjdk:8-jdk
     steps:
       - uses: actions/checkout@v4
-      - name: Setup System Tools
-        run: |
-          apt update -y
-          apt install -y gnupg2 curl
+
+      - name: Setup Java & Gradle
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'gradle'
 
       - name: Verify files
         run: |
           curl -sSL https://secchannel.rsk.co/SUPPORT.asc | gpg2 --import -
           gpg2 --verify SHA256SUMS.asc && sha256sum --check SHA256SUMS.asc
 
       - uses: actions/cache@v4
-        name: Cache Gradle
-        id: cache-gradle
+        name: Cache Gradle Wrapper
+        id: cache-gradle-wrapper
         with:
           path: |
-            .gradle/caches
-            gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - name: Get gradle wrapper and build dependencies
-        if: steps.cache-gradle.outputs.cache-hit != 'true'
+            gradle/wrapper/gradle-wrapper.jar
+          key: gradle-wrapper-v1
+
+      - name: Get Gradle wrapper
+        if: steps.cache-gradle-wrapper.outputs.cache-hit != 'true'
         run: |
           ./configure.sh
-          ./gradlew --no-daemon dependencies
 
       - name: Build
         run: |
@@ -56,36 +53,27 @@ jobs:
             rskj-core/build
 
   smell-test:
-    needs: unit-tests
+    needs: unit-tests-java17
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java JDK
-        uses: actions/setup-java@v3
+      - name: Setup Java & Gradle
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
+          cache: 'gradle'
 
-      - uses: actions/cache@v4
-        name: Restore Gradle cache
-        id: cache-gradle
+      - uses: actions/cache/restore@v4
+        name: Restore Gradle Wrapper
         with:
           path: |
-            .gradle/caches
-            gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - name: Get gradle wrapper and build dependencies
-        run: |
-          if [ ! -f gradle/wrapper/gradle-wrapper.jar ]; then
-            ./configure.sh
-            ./gradlew --no-daemon dependencies
-          fi
+            gradle/wrapper/gradle-wrapper.jar
+          key: gradle-wrapper-v1
+          fail-on-cache-miss: true
 
       - name: Download build artifacts
         uses: actions/download-artifact@v4
@@ -192,28 +180,20 @@ jobs:
         run: |
           node --unhandled-rejections=strict generateBtcBlocks.js
 
-      - name: Setup Java JDK
-        uses: actions/setup-java@v3
+      - name: Setup Java & Gradle
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
+          cache: 'gradle'
 
-      - uses: actions/cache@v4
-        name: Cache Gradle
-        id: cache-gradle
+      - uses: actions/cache/restore@v4
+        name: Restore Gradle Wrapper
         with:
           path: |
-            .gradle/caches
-            gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - name: Get gradle wrapper and build dependencies
-        if: steps.cache-gradle.outputs.cache-hit != 'true'
-        run: |
-          ./configure.sh
-          ./gradlew --no-daemon dependencies
+            gradle/wrapper/gradle-wrapper.jar
+          key: gradle-wrapper-v1
+          fail-on-cache-miss: true
 
       - name: Download build artifacts
         uses: actions/download-artifact@v4
@@ -247,35 +227,26 @@ jobs:
           npm test
           kill $rskpid
 
-  unit-tests:
+  unit-tests-java17:
     needs: build
     runs-on: ubuntu-latest
-    container:
-      image: openjdk:8-jdk
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup System Tools
-        run: |
-          apt update -y
-          apt install -y curl
+      - name: Setup Java & Gradle
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'gradle'
 
-      - uses: actions/cache@v4
-        name: Cache Gradle
-        id: cache-gradle
+      - uses: actions/cache/restore@v4
+        name: Restore Gradle Wrapper
         with:
           path: |
-            .gradle/caches
-            gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - name: Get gradle wrapper and build dependencies
-        if: steps.cache-gradle.outputs.cache-hit != 'true'
-        run: |
-          ./configure.sh
-          ./gradlew --no-daemon dependencies
+            gradle/wrapper/gradle-wrapper.jar
+          key: gradle-wrapper-v1
+          fail-on-cache-miss: true
 
       - name: Run tests
         run: |
@@ -295,34 +266,51 @@ jobs:
           path: |
             rskj-core/build/reports/
 
-  integration-tests:
+  unit-tests-java21:
+    needs: build
     runs-on: ubuntu-latest
-    container:
-      image: openjdk:8-jdk
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup System Tools
-        run: |
-          apt update -y
-          apt install -y curl
+      - name: Setup Java & Gradle
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: 'gradle'
 
-      - uses: actions/cache@v4
-        name: Cache Gradle
-        id: cache-gradle
+      - uses: actions/cache/restore@v4
+        name: Restore Gradle Wrapper
         with:
           path: |
-            .gradle/caches
-            gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - name: Get gradle wrapper and build dependencies
-        if: steps.cache-gradle.outputs.cache-hit != 'true'
+            gradle/wrapper/gradle-wrapper.jar
+          key: gradle-wrapper-v1
+          fail-on-cache-miss: true
+
+      - name: Run tests
         run: |
-          ./configure.sh
-          ./gradlew --no-daemon dependencies
+          ./gradlew --no-daemon --stacktrace test
+
+  integration-tests:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Java & Gradle
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'gradle'
+
+      - uses: actions/cache/restore@v4
+        name: Restore Gradle Wrapper
+        with:
+          path: |
+            gradle/wrapper/gradle-wrapper.jar
+          key: gradle-wrapper-v1
+          fail-on-cache-miss: true
 
       - name: Run tests
         run: |

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -26,20 +26,27 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Setup Java JDK
+        if: ${{ matrix.language == 'java' }}
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
       - name: Before Index (java)
         if: ${{ matrix.language == 'java' }}
         run: ./configure.sh
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{ matrix.language }}"