Merge pull request #1 from tdlight-team/master

merge
This commit is contained in:
davtur19 2021-03-15 14:08:35 +01:00 committed by GitHub
commit 9bee253fd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 22 deletions

View File

@ -2,27 +2,24 @@ name: Build TDLib natives
on:
push:
pull_request:
schedule:
- cron: '0 0 * * 0' # weekly
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"}

View File

@ -2,9 +2,6 @@ name: Generate TdApi.java
on:
push:
pull_request:
schedule:
- cron: '0 0 * * 0' # weekly
jobs:
build:

@ -1 +1 @@
Subproject commit 3f856ccb46f79936b162eeeb0f645cd3d457cac8
Subproject commit 29ded98a46cf98e77de1d725ed33e28f76c0a23d

@ -1 +1 @@
Subproject commit 9a01a9da1d8f5e8d16f0f7b640bc2031c49738e1
Subproject commit 2bcb81bec0ed3f537beef0d918757a0839e2209e

View File

@ -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

View File

@ -1,7 +1,7 @@
#!/bin/bash -e
cd ../../generated
mvn clean package
mvn -B -q clean package
echo "Done."
exit 0

View File

@ -10,7 +10,7 @@ fi
cd ../../generated
mvn -B -Drevision=${REVISION} clean deploy
mvn -B -q -Drevision=${REVISION} clean deploy
echo "Done."
exit 0

View File

@ -1,7 +1,7 @@
#!/bin/bash -e
cd ../../generated
mvn -B deploy
mvn -B -q deploy
echo "Done."
exit 0

View File

@ -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)'"