From e13f2ef7703c14f291620b1d88b90af3e664e994 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Fri, 12 Mar 2021 14:57:56 +0100 Subject: [PATCH] Update tdlight --- .github/workflows/natives.yaml | 28 +++++++++++-------- .github/workflows/tdapi.yaml | 8 ++++-- implementations/tdlib | 2 +- implementations/tdlight | 2 +- scripts/core/build_generated_maven_project.sh | 2 +- .../build_generated_tdapi_maven_project.sh | 2 +- scripts/core/deploy_release.sh | 2 +- scripts/core/deploy_snapshot.sh | 2 +- scripts/core/generate_td_tools.sh | 5 ++++ 9 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.github/workflows/natives.yaml b/.github/workflows/natives.yaml index 78f0b7a..207f1ff 100644 --- a/.github/workflows/natives.yaml +++ b/.github/workflows/natives.yaml @@ -2,27 +2,31 @@ name: Build TDLib natives on: push: + branches: + - main + - master pull_request: - schedule: - - cron: '0 0 * * 0' # weekly + branches: + - main + - master jobs: build: strategy: matrix: include: - - {os: ubuntu-20.04, arch: "linux/386", implementation: "tdlight"} - - {os: ubuntu-20.04, arch: "linux/386", implementation: "tdlib"} +# - {os: ubuntu-20.04, arch: "linux/386", implementation: "tdlight"} +# - {os: ubuntu-20.04, arch: "linux/386", implementation: "tdlib"} - {os: ubuntu-20.04, arch: "linux/amd64", implementation: "tdlight"} - {os: ubuntu-20.04, arch: "linux/amd64", implementation: "tdlib"} - - {os: ubuntu-20.04, arch: "linux/arm/v6", implementation: "tdlight"} - - {os: ubuntu-20.04, arch: "linux/arm/v6", implementation: "tdlib"} - - {os: ubuntu-20.04, arch: "linux/arm/v7", implementation: "tdlight"} - - {os: ubuntu-20.04, arch: "linux/arm/v7", implementation: "tdlib"} - - {os: ubuntu-20.04, arch: "linux/arm64", implementation: "tdlight"} - - {os: ubuntu-20.04, arch: "linux/arm64", implementation: "tdlib"} - - {os: ubuntu-20.04, arch: "linux/ppc64le", implementation: "tdlight"} - - {os: ubuntu-20.04, arch: "linux/ppc64le", implementation: "tdlib"} +# - {os: ubuntu-20.04, arch: "linux/arm/v6", implementation: "tdlight"} +# - {os: ubuntu-20.04, arch: "linux/arm/v6", implementation: "tdlib"} +# - {os: ubuntu-20.04, arch: "linux/arm/v7", implementation: "tdlight"} +# - {os: ubuntu-20.04, arch: "linux/arm/v7", implementation: "tdlib"} +# - {os: ubuntu-20.04, arch: "linux/arm64", implementation: "tdlight"} +# - {os: ubuntu-20.04, arch: "linux/arm64", implementation: "tdlib"} +# - {os: ubuntu-20.04, arch: "linux/ppc64le", implementation: "tdlight"} +# - {os: ubuntu-20.04, arch: "linux/ppc64le", implementation: "tdlib"} - {os: windows-2019, arch: "amd64", implementation: "tdlight"} - {os: windows-2019, arch: "amd64", implementation: "tdlib"} - {os: macos-10.15, arch: "amd64", implementation: "tdlight"} diff --git a/.github/workflows/tdapi.yaml b/.github/workflows/tdapi.yaml index d503a12..cdf5183 100644 --- a/.github/workflows/tdapi.yaml +++ b/.github/workflows/tdapi.yaml @@ -2,9 +2,13 @@ name: Generate TdApi.java on: push: + branches: + - main + - master pull_request: - schedule: - - cron: '0 0 * * 0' # weekly + branches: + - main + - master jobs: build: diff --git a/implementations/tdlib b/implementations/tdlib index 3f856cc..29ded98 160000 --- a/implementations/tdlib +++ b/implementations/tdlib @@ -1 +1 @@ -Subproject commit 3f856ccb46f79936b162eeeb0f645cd3d457cac8 +Subproject commit 29ded98a46cf98e77de1d725ed33e28f76c0a23d diff --git a/implementations/tdlight b/implementations/tdlight index 9a01a9d..633856a 160000 --- a/implementations/tdlight +++ b/implementations/tdlight @@ -1 +1 @@ -Subproject commit 9a01a9da1d8f5e8d16f0f7b640bc2031c49738e1 +Subproject commit 633856a4130e753f39c665af97abb3e3a4d97700 diff --git a/scripts/core/build_generated_maven_project.sh b/scripts/core/build_generated_maven_project.sh index 50e4831..a85657d 100755 --- a/scripts/core/build_generated_maven_project.sh +++ b/scripts/core/build_generated_maven_project.sh @@ -2,7 +2,7 @@ cd ../../generated [ -f ./src/main/java/it/tdlight/jni/TdApi.java ] && rm ./src/main/java/it/tdlight/jni/TdApi.java -mvn clean package +mvn -B -q clean package echo "Done." exit 0 diff --git a/scripts/core/build_generated_tdapi_maven_project.sh b/scripts/core/build_generated_tdapi_maven_project.sh index 449f657..b7cd947 100755 --- a/scripts/core/build_generated_tdapi_maven_project.sh +++ b/scripts/core/build_generated_tdapi_maven_project.sh @@ -1,7 +1,7 @@ #!/bin/bash -e cd ../../generated -mvn clean package +mvn -B -q clean package echo "Done." exit 0 diff --git a/scripts/core/deploy_release.sh b/scripts/core/deploy_release.sh index ef19ae4..fd14e4b 100755 --- a/scripts/core/deploy_release.sh +++ b/scripts/core/deploy_release.sh @@ -10,7 +10,7 @@ fi cd ../../generated -mvn -B -Drevision=${REVISION} clean deploy +mvn -B -q -Drevision=${REVISION} clean deploy echo "Done." exit 0 diff --git a/scripts/core/deploy_snapshot.sh b/scripts/core/deploy_snapshot.sh index c405693..ffb68d8 100755 --- a/scripts/core/deploy_snapshot.sh +++ b/scripts/core/deploy_snapshot.sh @@ -1,7 +1,7 @@ #!/bin/bash -e cd ../../generated -mvn -B deploy +mvn -B -q deploy echo "Done." exit 0 diff --git a/scripts/core/generate_td_tools.sh b/scripts/core/generate_td_tools.sh index b7489c9..da49ddc 100755 --- a/scripts/core/generate_td_tools.sh +++ b/scripts/core/generate_td_tools.sh @@ -70,6 +70,11 @@ cmake --build . --target prepare_cross_compiling --config Release ${CPU_CORES} echo "Generating java tools..." cmake --build . --target td_generate_java_api --config Release ${CPU_CORES} +# Copy tlo files +echo "Copying *.tlo files..." +cp -r ../implementation/td/generate/auto/tlo/. ../implementation/td/generate/scheme/. + + echo "Generated executable '$(realpath -m ./td/generate/generate_common)'" echo "Generated executable '$(realpath -m ./td/generate/td_generate_java_api)'" echo "Generated executable '$(realpath -m ./td/generate/td_generate_json)'"