Skip to content

Commit 4c8d168

Browse files
committed
fix android tonlib GH action;
1 parent edf57e5 commit 4c8d168

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

.github/workflows/macos-11.7-compile.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ jobs:
1717
git clone https://github.com/openssl/openssl openssl_1_1_1
1818
cd openssl_1_1_1
1919
git checkout OpenSSL_1_1_1-stable
20-
./Configure --prefix=/usr/local/macos darwin64-x86_64-cc -static -mmacosx-version-min=11.7
20+
./Configure darwin64-x86_64-cc -static -mmacosx-version-min=11.7
2121
make build_libs -j4
2222
2323
- name: Build all
2424
run: |
2525
brew unlink openssl@3
26-
2726
export NONINTERACTIVE=1
2827
brew install ninja secp256k1 libsodium libmicrohttpd pkg-config
2928
rootPath=`pwd`

.github/workflows/macos-12.6-compile.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
git clone https://github.com/openssl/openssl openssl_1_1_1
2020
cd openssl_1_1_1
2121
git checkout OpenSSL_1_1_1-stable
22-
./Configure --prefix=/usr/local/macos darwin64-x86_64-cc -static -mmacosx-version-min=12.6
22+
./Configure darwin64-x86_64-cc -static -mmacosx-version-min=12.6
2323
make build_libs -j4
2424
2525
- name: Compile Secp256k1
@@ -34,7 +34,6 @@ jobs:
3434
- name: Build all
3535
run: |
3636
brew unlink openssl@3
37-
3837
export NONINTERACTIVE=1
3938
brew install ninja libmicrohttpd pkg-config
4039
rootPath=`pwd`

.github/workflows/tonlib-android-jni.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
sudo apt install -y build-essential git make cmake clang libgflags-dev zlib1g-dev libssl-dev libreadline-dev libmicrohttpd-dev pkg-config libgsl-dev python3 python3-dev ninja-build
2020
2121
- name: Configure & Build
22-
run: |
23-
wget https://dl.google.com/android/repository/android-ndk-r25b-linux.zip
24-
unzip android-ndk-r25b-linux.zip
22+
run: |
23+
wget -q https://dl.google.com/android/repository/android-ndk-r25b-linux.zip
24+
unzip -q android-ndk-r25b-linux.zip
2525
export JAVA_AWT_LIBRARY=NotNeeded
2626
export JAVA_JVM_LIBRARY=NotNeeded
2727
export JAVA_INCLUDE_PATH=${JAVA_HOME}/include

example/android/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ then
3636
BLST_LIBRARY=$(pwd)/third_party/blst/armv8/libblst.a
3737
fi
3838

39-
39+
ORIG_ARCH=$ARCH
4040
ARCH=$ABI
4141

4242
mkdir -p build-$ARCH
@@ -46,7 +46,7 @@ cmake .. -GNinja -DPORTABLE=1 \
4646
-DANDROID_ABI=x86 -DANDROID_PLATFORM=android-32 -DANDROID_NDK=${ANDROID_NDK_ROOT} \
4747
-DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake \
4848
-DCMAKE_BUILD_TYPE=Release -DANDROID_ABI=${ABI} \
49-
-DOPENSSL_ROOT_DIR=${OPENSSL_DIR}/${ARCH} -DTON_ARCH="" \
49+
-DOPENSSL_ROOT_DIR=${OPENSSL_DIR}/${ORIG_ARCH} -DTON_ARCH="" \
5050
-DTON_ONLY_TONLIB=ON \
5151
-DSECP256K1_INCLUDE_DIR=${SECP256K1_INCLUDE_DIR} -DSECP256K1_LIBRARY=${SECP256K1_LIBRARY} \
5252
-DSODIUM_INCLUDE_DIR=${SODIUM_INCLUDE_DIR} -DSODIUM_LIBRARY_RELEASE=${SODIUM_LIBRARY_RELEASE} \

0 commit comments

Comments
 (0)