Skip to content

Commit 05bea13

Browse files
authored
Force jammy llvm-toolchain usage on Ubuntu 22.04 ARM github images (#1808)
* add libgslcblas into portable binaries * remove commented line * fix portable linux binaries * force llvm jammy installation on ubuntu 22.04
1 parent 1382059 commit 05bea13

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

.github/workflows/build-ton-linux-arm64-appimage.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@ jobs:
2121
- name: Install system libraries
2222
run: |
2323
sudo apt update
24-
sudo apt install -y build-essential git cmake ninja-build zlib1g-dev libsecp256k1-dev libmicrohttpd-dev libsodium-dev liblz4-dev ccache
25-
sudo apt remove libgsl-dev
24+
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
2625
mkdir ~/.ccache 3pp
2726
2827
- name: Install clang-16
2928
run: |
30-
wget https://apt.llvm.org/llvm.sh
31-
chmod +x llvm.sh
32-
sudo ./llvm.sh 16 clang
29+
lsb_release -a
30+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
31+
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | sudo tee /etc/apt/sources.list.d/llvm.list
32+
sudo apt-get -y update
33+
sudo apt-get install -y clang-16
3334
3435
- name: Cache 3pp
3536
id: cache-3pp

.github/workflows/build-ton-linux-arm64-shared.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ jobs:
3131
- if: matrix.os != 'ubuntu-24.04-arm'
3232
name: Install llvm-16
3333
run: |
34-
wget https://apt.llvm.org/llvm.sh
35-
chmod +x llvm.sh
36-
sudo ./llvm.sh 16 clang
34+
lsb_release -a
35+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
36+
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | sudo tee /etc/apt/sources.list.d/llvm.list
37+
sudo apt-get -y update
38+
sudo apt-get install -y clang-16
3739
3840
- name: Cache OpenSSL
3941
id: cache-openssl

.github/workflows/build-ton-linux-x86-64-appimage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Install system libraries
2222
run: |
2323
sudo apt update
24-
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
24+
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
2525
mkdir ~/.ccache 3pp
2626
2727
- name: Install clang-16

assembly/appimage/create-appimages.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ for file in ../artifacts/*; do
2727
printf '[Desktop Entry]\nName='$appName'\nExec='$appName'\nIcon='$appName'\nType=Application\nCategories=Utility;\n' > $appName.AppDir/$appName.desktop
2828
cp ../ton.png $appName.AppDir/$appName.png
2929
cp $file $appName.AppDir/usr/bin/
30-
cp ../build/openssl_3/libcrypto.so.3 \
30+
cp ../openssl_3/libcrypto.so.3 \
3131
/lib/$ARCH-linux-gnu/libatomic.so.1 \
3232
/lib/$ARCH-linux-gnu/libsodium.so.23 \
3333
/lib/$ARCH-linux-gnu/libz.so.1 \
@@ -37,6 +37,7 @@ for file in ../artifacts/*; do
3737
/lib/$ARCH-linux-gnu/libstdc++.so.6 \
3838
/lib/$ARCH-linux-gnu/libgsl.so.27 \
3939
/lib/$ARCH-linux-gnu/libblas.so.3 \
40+
/lib/$ARCH-linux-gnu/libgslcblas.so.0 \
4041
$appName.AppDir/usr/lib/
4142

4243
chmod +x ./$appName.AppDir/usr/bin/$appName

0 commit comments

Comments
 (0)