From b64e1349c3d00727d54a92c69964622a2fbffb2f Mon Sep 17 00:00:00 2001
From: gautomga <gautomga@gmail.com>
Date: Wed, 8 Oct 2025 04:52:35 +0600
Subject: [PATCH] =?UTF-8?q?Revert=20"Force=20jammy=20llvm-toolchain=20usag?=
 =?UTF-8?q?e=20on=20Ubuntu=2022.04=20ARM=20github=20images=20(#=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 05bea13375448a401d8e07c6132b7f709f5e3a32.
---
 .github/workflows/build-ton-linux-arm64-appimage.yml  | 11 +++++------
 .github/workflows/build-ton-linux-arm64-shared.yml    |  8 +++-----
 .github/workflows/build-ton-linux-x86-64-appimage.yml |  2 +-
 assembly/appimage/create-appimages.sh                 |  3 +--
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-ton-linux-arm64-appimage.yml b/.github/workflows/build-ton-linux-arm64-appimage.yml
index b7ecdc784..a0ba4a022 100644
--- a/.github/workflows/build-ton-linux-arm64-appimage.yml
+++ b/.github/workflows/build-ton-linux-arm64-appimage.yml
@@ -21,16 +21,15 @@ jobs:
     - name: Install system libraries
       run: |
         sudo apt update
-        sudo apt install -y build-essential git cmake ninja-build zlib1g-dev libsecp256k1-dev libmicrohttpd-dev libsodium-dev liblz4-dev ccache libgsl-dev libblas-dev libgslcblas0
+        sudo apt install -y build-essential git cmake ninja-build zlib1g-dev libsecp256k1-dev libmicrohttpd-dev libsodium-dev liblz4-dev ccache        
+        sudo apt remove libgsl-dev
         mkdir ~/.ccache 3pp
 
     - name: Install clang-16
       run: |
-        lsb_release -a
-        wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | sudo tee /etc/apt/sources.list.d/llvm.list
-        sudo apt-get -y update
-        sudo apt-get install -y clang-16
+        wget https://apt.llvm.org/llvm.sh
+        chmod +x llvm.sh
+        sudo ./llvm.sh 16 clang
 
     - name: Cache 3pp
       id: cache-3pp
diff --git a/.github/workflows/build-ton-linux-arm64-shared.yml b/.github/workflows/build-ton-linux-arm64-shared.yml
index e7de5002b..540fffece 100644
--- a/.github/workflows/build-ton-linux-arm64-shared.yml
+++ b/.github/workflows/build-ton-linux-arm64-shared.yml
@@ -31,11 +31,9 @@ jobs:
     - if: matrix.os != 'ubuntu-24.04-arm'
       name: Install llvm-16
       run: |
-        lsb_release -a
-        wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | sudo tee /etc/apt/sources.list.d/llvm.list
-        sudo apt-get -y update
-        sudo apt-get install -y clang-16
+        wget https://apt.llvm.org/llvm.sh
+        chmod +x llvm.sh
+        sudo ./llvm.sh 16 clang
 
     - name: Cache OpenSSL
       id: cache-openssl
diff --git a/.github/workflows/build-ton-linux-x86-64-appimage.yml b/.github/workflows/build-ton-linux-x86-64-appimage.yml
index cb02b7bc2..7ad873d22 100644
--- a/.github/workflows/build-ton-linux-x86-64-appimage.yml
+++ b/.github/workflows/build-ton-linux-x86-64-appimage.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Install system libraries
       run: |
         sudo apt update
-        sudo apt install -y build-essential git cmake ninja-build zlib1g-dev libsecp256k1-dev libmicrohttpd-dev libsodium-dev liblz4-dev ccache libgsl-dev libblas-dev libgslcblas0       
+        sudo apt install -y build-essential git cmake ninja-build zlib1g-dev libsecp256k1-dev libmicrohttpd-dev libsodium-dev liblz4-dev ccache libgsl-dev libblas-dev        
         mkdir ~/.ccache 3pp
 
     - name: Install clang-16
diff --git a/assembly/appimage/create-appimages.sh b/assembly/appimage/create-appimages.sh
index f6e269072..7bd68b6fb 100644
--- a/assembly/appimage/create-appimages.sh
+++ b/assembly/appimage/create-appimages.sh
@@ -27,7 +27,7 @@ for file in ../artifacts/*; do
     printf '[Desktop Entry]\nName='$appName'\nExec='$appName'\nIcon='$appName'\nType=Application\nCategories=Utility;\n' > $appName.AppDir/$appName.desktop
     cp ../ton.png $appName.AppDir/$appName.png
     cp $file $appName.AppDir/usr/bin/
-    cp ../openssl_3/libcrypto.so.3 \
+    cp ../build/openssl_3/libcrypto.so.3 \
       /lib/$ARCH-linux-gnu/libatomic.so.1 \
       /lib/$ARCH-linux-gnu/libsodium.so.23 \
       /lib/$ARCH-linux-gnu/libz.so.1 \
@@ -37,7 +37,6 @@ for file in ../artifacts/*; do
       /lib/$ARCH-linux-gnu/libstdc++.so.6 \
       /lib/$ARCH-linux-gnu/libgsl.so.27 \
       /lib/$ARCH-linux-gnu/libblas.so.3 \
-      /lib/$ARCH-linux-gnu/libgslcblas.so.0 \
       $appName.AppDir/usr/lib/
 
     chmod +x ./$appName.AppDir/usr/bin/$appName