Merge remote-tracking branch 'origin/main' into arm64-aarch64

.github/workflows/release.yml

@@ -0,0 +1,68 @@
+name: Create release
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - arm64-aarch64
+      - test-release
+
+jobs:
+  build:
+    runs-on: windows-2019
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+
+      - name: Build with Maven
+        run: mvn package -DskipTests
+
+      - name: Upload artifact
+        run: mkdir MyLocalTon && cp target/MyLocalTon.jar MyLocalTon
+      - uses: actions/upload-artifact@v2
+        with:
+          name: MyLocalTon
+          path: MyLocalTon
+
+      - name: Read CHANGELOG.md and use it as a body of new release
+        id: read_release
+        shell: bash
+        run: |
+          r=$(cat CHANGELOG.md)
+          r="${r//'%'/'%25'}"
+          r="${r//$'\n'/'%0A'}"
+          r="${r//$'\r'/'%0D'}"
+          echo "::set-output name=CHANGELOG_BODY::$r"
+
+      - name: Get the current branch name
+        shell: bash
+        run: echo "::set-output name=branch::${GITHUB_REF#refs/heads/}"
+        id: myref
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: v${{ github.run_number }}-${{ steps.myref.outputs.branch }}
+          release_name: MyLocalTon v${{ github.run_number }}-${{ steps.myref.outputs.branch }}
+          body: |
+            ${{ steps.read_release.outputs.CHANGELOG_BODY }}
+          draft: false
+          prerelease: true
+
+      - name: Upload binaries to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: target/MyLocalTon.jar
+          asset_name: MyLocalTon.jar
+          tag: v${{ github.run_number }}-${{ steps.myref.outputs.branch }}
+          overwrite: true

CHANGELOG.md

@@ -0,0 +1,4 @@
+### Changes in this release
+- Ubuntu and Windows binaries updated to 2022.08. MacOS update comes soon 
+- Windows blockchain-explorer now comes with 3rd party dlls
+- Added binaries compatible with Ubuntu 18.04-arm64 and 22.04-arm64

README.md

@@ -9,18 +9,20 @@ alpha version and cannot be treated as production ready.
 
 ## Matrix of supported OS & Java
 
-| OS \ Java   | 11  | 13  | 15  | 17  |
-|---|---|---|---|---|
-| Ubuntu 18.04  | :heavy_check_mark:   | :heavy_check_mark:   | :heavy_check_mark:   | :heavy_check_mark:  |
-| Ubuntu 20.04  | :heavy_check_mark:   | :heavy_check_mark:   | :heavy_check_mark:   | :heavy_check_mark:    |  |
+| OS \ Java            | 11  | 13  | 15  | 17  |
+|----------------------|---|---|---|---|
+| Ubuntu 18.04         | :heavy_check_mark:   | :heavy_check_mark:   | :heavy_check_mark:   | :heavy_check_mark:  |
+| Ubuntu 20.04         | :heavy_check_mark:   | :heavy_check_mark:   | :heavy_check_mark:   | :heavy_check_mark:    |  |
+| Ubuntu 22.04         | not tested   | not tested   | not tested   | :heavy_check_mark:    |  |
+| Ubuntu 18.04 aarch64 | not tested   | not tested   | not tested   | :heavy_check_mark:    |  |
 | Ubuntu 20.04 aarch64 | not tested   | not tested   | not tested   | :heavy_check_mark:    |  |
-| Ubuntu 22.04 | not tested   | not tested   | not tested   | :heavy_check_mark:    |  |
-| Debian 11.2  | not tested   | not tested   | not tested   | :heavy_check_mark:    |  |
-| MacOS 11.6.1 M1  | :heavy_check_mark:   | not tested   |  not tested | :heavy_check_mark:    |  |
-| MacOS 12.2.1 M1  | not tested   | not tested   |  not tested | :heavy_check_mark:    |  |
-| MacOS 12.01  | :heavy_check_mark:   | :heavy_check_mark:   |  not tested | :heavy_check_mark:    |  |
-| MacOS 11.6  | :heavy_check_mark:   | :heavy_check_mark:   |  not tested | :heavy_check_mark:    |  |
-| Windows 10  | :heavy_check_mark:   | :heavy_check_mark:   |  not tested | :heavy_check_mark:   |  |
+| Ubuntu 22.04 aarch64 | not tested   | not tested   | not tested   | :heavy_check_mark:    |  |
+| Debian 11.2          | not tested   | not tested   | not tested   | :heavy_check_mark:    |  |
+| MacOS 11.6.1 M1      | :heavy_check_mark:   | not tested   |  not tested | :heavy_check_mark:    |  |
+| MacOS 12.2.1 M1      | not tested   | not tested   |  not tested | :heavy_check_mark:    |  |
+| MacOS 12.01          | :heavy_check_mark:   | :heavy_check_mark:   |  not tested | :heavy_check_mark:    |  |
+| MacOS 11.6           | :heavy_check_mark:   | :heavy_check_mark:   |  not tested | :heavy_check_mark:    |  |
+| Windows 10           | :heavy_check_mark:   | :heavy_check_mark:   |  not tested | :heavy_check_mark:   |  |
 | Windows Server 2019  | :heavy_check_mark:   | :heavy_check_mark:   | not tested  | :heavy_check_mark:    |  |
 
 Please make sure you are not using headless (no GUI) Java and OS/Java combination matches as per table above.

src/main/java/org/ton/utils/Extractor.java

@@ -57,13 +57,23 @@ private void extractBinaries() throws IOException {
                 } else if (isUnix()) {
                     if (Utils.getUbuntuVersion().equals("20.04")) {
                         extractUbuntuBinaries("ubuntu20");
-                    } else if (Utils.getUbuntuVersion().equals("20.04-arm64")) {
+                    }
+                    else if (Utils.getUbuntuVersion().equals("20.04-arm64")) {
                         extractUbuntuBinaries("ubuntu20-arm64");
-                    } else if (Utils.getUbuntuVersion().equals("18.04")) {
+                    }
+                    else if (Utils.getUbuntuVersion().equals("18.04")) {
                         extractUbuntuBinaries("ubuntu18");
-                    } else if (Utils.getUbuntuVersion().equals("22.04")) {
+                    }
+                    else if (Utils.getUbuntuVersion().equals("18.04-arm64")) {
+                        extractUbuntuBinaries("ubuntu18-arm64");
+                    }
+                    else if (Utils.getUbuntuVersion().equals("22.04")) {
                         extractUbuntuBinaries("ubuntu22");
-                    } else {
+                    }
+                    else if (Utils.getUbuntuVersion().equals("22.04-arm64")) {
+                        extractUbuntuBinaries("ubuntu22-arm64");
+                    }
+                    else {
                         log.error("This Linux system officially is not supported, but let's try to run TON binaries compiled on Ubuntu 20.04");
                         extractUbuntuBinaries("ubuntu20");
                     }

src/main/java/org/ton/utils/Utils.java

@@ -485,8 +485,7 @@ public static String getUbuntuVersion() {
             }
         } else if (lsb.contains("18.04")) {
             if (uname.contains("aarch64")) {
-                log.error("Ubuntu 18.04 aarch64-arm64 is not supported.");
-                return "";
+                return "18.04-arm64";
             } else {
                 return "18.04";
             }