From 2f1ce435889e9ec67bfcc68b4a1bf55ed50aceea Mon Sep 17 00:00:00 2001 From: neodiX42 Date: Tue, 3 May 2022 13:31:16 +0200 Subject: [PATCH] Move native-lib build into other github action (#343) * move native-lib build into other git action * Update macos-10.15-compile.yml * Update ubuntu-18.04-compile.yml * Update ubuntu-18.04-compile.yml --- .github/workflows/macos-10.15-compile.yml | 25 ++------------------ .github/workflows/ubuntu-18.04-compile.yml | 25 +++----------------- .github/workflows/windows2019x64-compile.yml | 23 +----------------- 3 files changed, 6 insertions(+), 67 deletions(-) diff --git a/.github/workflows/macos-10.15-compile.yml b/.github/workflows/macos-10.15-compile.yml index be8e44e8..1aa36a9f 100644 --- a/.github/workflows/macos-10.15-compile.yml +++ b/.github/workflows/macos-10.15-compile.yml @@ -28,33 +28,12 @@ jobs: cmake -DOPENSSL_FOUND=1 -DOPENSSL_INCLUDE_DIR=$rootPath/openssl_1_1_1/include -DOPENSSL_CRYPTO_LIBRARY=$rootPath/openssl_1_1_1/libcrypto.a -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.15 -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_BUILD_TYPE=Release .. make -j4 - - name: Build native-lib - run: | - rootPath=`pwd` - export JAVA_AWT_LIBRARY=NotNeeded - export JAVA_JVM_LIBRARY=NotNeeded - export JAVA_INCLUDE_PATH=${JAVA_HOME}/include - export JAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include - export JAVA_INCLUDE_PATH2=${JAVA_HOME}/include/darwin - git fetch --all - git pull --all - git checkout wallets - cd example/android/ - mkdir build - cd build - cmake -DOPENSSL_FOUND=1 -DOPENSSL_INCLUDE_DIR=$rootPath/openssl_1_1_1/include -DOPENSSL_CRYPTO_LIBRARY=$rootPath/openssl_1_1_1/libcrypto.a -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.15 -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_BUILD_TYPE=Release -DTON_ONLY_TONLIB=ON .. - cmake --build . --target prepare_cross_compiling - cmake --build . --target native-lib - - name: Find & copy binaries run: | - mkdir -p artifacts/tonlib-java - rsync -r --exclude 'CMakeFiles' --exclude 'Makefile' --exclude '*.a' --exclude '*.cmake' --exclude 'third-party' --exclude 'test-*' --exclude '*.cc' --exclude '*.json' --exclude '*.txt' build/* artifacts/ - cp example/android/src/drinkless/org/ton/TonApi.java artifacts/tonlib-java/ - cp example/android/build/libnative-lib.dylib artifacts/tonlib-java/ + rsync -r --exclude 'CMakeFiles' --exclude 'Makefile' --exclude '*.a' --exclude '*.cmake' --exclude 'third-party' --exclude 'test-*' --exclude '*.cc' --exclude '*.json' --exclude '*.txt' build/* artifacts/ - name: Upload artifacts uses: actions/upload-artifact@master with: name: ton-macos-binaries - path: artifacts \ No newline at end of file + path: artifacts diff --git a/.github/workflows/ubuntu-18.04-compile.yml b/.github/workflows/ubuntu-18.04-compile.yml index 46136fbf..f27185bb 100644 --- a/.github/workflows/ubuntu-18.04-compile.yml +++ b/.github/workflows/ubuntu-18.04-compile.yml @@ -35,32 +35,13 @@ jobs: cd build make -j4 fift func tonlib tonlibjson tonlib-cli validator-engine lite-client pow-miner validator-engine-console generate-random-id json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork - - name: build native-lib - run: | - export JAVA_AWT_LIBRARY=NotNeeded - export JAVA_JVM_LIBRARY=NotNeeded - export JAVA_INCLUDE_PATH=${JAVA_HOME}/include - export JAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include - export JAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux - git fetch --all - git pull --all - git checkout wallets - cd example/android/ - mkdir build - cd build - cmake -DCMAKE_BUILD_TYPE=Release -DTON_ONLY_TONLIB=ON .. - cmake --build . --target prepare_cross_compiling - cmake --build . --target native-lib - - name: find & copy binaries run: | - mkdir -p artifacts/tonlib-java - cp --parents build/crypto/fift build/crypto/tlbc build/crypto/func build/crypto/create-state build/validator-engine-console/validator-engine-console build/tonlib/tonlib-cli build/tonlib/libtonlibjson.so.0.5 build/http/http-proxy build/rldp-http-proxy/rldp-http-proxy build/dht-server/dht-server build/lite-client/lite-client build/validator-engine/validator-engine build/utils/generate-random-id build/utils/json2tlo build/adnl/adnl-proxy artifacts - cp example/android/src/drinkless/org/ton/TonApi.java artifacts/tonlib-java/ - cp example/android/build/libnative-lib.so artifacts/tonlib-java/ + mkdir artifacts + cp build/crypto/fift build/crypto/tlbc build/crypto/func build/crypto/create-state build/validator-engine-console/validator-engine-console build/tonlib/tonlib-cli build/tonlib/libtonlibjson.so.0.5 build/http/http-proxy build/rldp-http-proxy/rldp-http-proxy build/dht-server/dht-server build/lite-client/lite-client build/validator-engine/validator-engine build/utils/generate-random-id build/utils/json2tlo build/adnl/adnl-proxy artifacts - name: Upload artifacts uses: actions/upload-artifact@master with: name: ton-binaries - path: artifacts \ No newline at end of file + path: artifacts diff --git a/.github/workflows/windows2019x64-compile.yml b/.github/workflows/windows2019x64-compile.yml index e04c3feb..73314778 100644 --- a/.github/workflows/windows2019x64-compile.yml +++ b/.github/workflows/windows2019x64-compile.yml @@ -33,7 +33,6 @@ jobs: - name: Compile zlib Win64 run: | cd zlib\contrib\vstudio\vc14 - msbuild zlibstat.vcxproj /p:Configuration=Debug /p:platform=x64 -p:PlatformToolset=v142 msbuild zlibstat.vcxproj /p:Configuration=ReleaseWithoutAsm /p:platform=x64 -p:PlatformToolset=v142 - name: Install OpenSSL Win64 @@ -52,25 +51,7 @@ jobs: - name: Compile ton run: | cd build - cmake --build . --config Release - continue-on-error: true - - - name: Compile native-lib - run: | - set root=%cd% - set JAVA_AWT_LIBRARY=NotNeeded - set JAVA_JVM_LIBRARY=NotNeeded - set JAVA_INCLUDE_PATH=${JAVA_HOME}/include - set JAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include - set JAVA_INCLUDE_PATH2=${JAVA_HOME}/include/win32 - git fetch --all - git pull --all - git checkout wallets - cd example/android/ - mkdir build - cd build - cmake -DZLIB_FOUND=1 -DZLIB_INCLUDE_DIR=%root%\zlib -DZLIB_LIBRARY=%root%\zlib\contrib\vstudio\vc14\x64\ZlibStatReleaseWithoutAsm\zlibstat.lib -DTON_ONLY_TONLIB=ON .. - cmake --build . --target native-lib --config Release + cmake --build . --target fift func tonlib tonlibjson tonlib-cli validator-engine lite-client pow-miner validator-engine-console generate-random-id json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork --config Release - name: Show executables run: | @@ -88,8 +69,6 @@ jobs: run: | mkdir artifacts for /f %%a in ('dir *.exe /b /a /s') do copy /Y %%a artifacts - copy build\tonlib\Release\tonlibjson.dll artifacts - copy example\android\build\Release\native-lib.dll artifacts - name: Upload artifacts uses: actions/upload-artifact@master