From 6b2ac5e729b44fde0566a30e53abcb1a4209dc0a Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 4 May 2021 22:45:46 +0200 Subject: [PATCH] Update tdlib and tdlight --- .github/workflows/platform_natives.yaml | 20 +++++++++---------- implementations/tdlib | 2 +- implementations/tdlight | 2 +- .../github-workflows/install-dependencies.sh | 4 ++-- .../github-workflows/setup-variables.sh | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml index 4851d2b..5723771 100644 --- a/.github/workflows/platform_natives.yaml +++ b/.github/workflows/platform_natives.yaml @@ -12,16 +12,16 @@ jobs: strategy: matrix: include: - - {os: ubuntu-20.04, usedocker: "true", arch: "linux/386", implementation: "tdlight"} - - {os: ubuntu-20.04, usedocker: "true", arch: "linux/386", implementation: "tdlib"} - - {os: ubuntu-20.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlight"} - - {os: ubuntu-20.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlib"} - - {os: ubuntu-20.04, usedocker: "true", arch: "linux/arm/v6", implementation: "tdlight"} - - {os: ubuntu-20.04, usedocker: "true", arch: "linux/arm/v6", implementation: "tdlib"} - - {os: ubuntu-20.04, usedocker: "true", arch: "linux/arm/v7", implementation: "tdlight"} - - {os: ubuntu-20.04, usedocker: "true", arch: "linux/arm/v7", implementation: "tdlib"} - - {os: ubuntu-20.04, usedocker: "true", arch: "linux/arm64", implementation: "tdlight"} - - {os: ubuntu-20.04, usedocker: "true", arch: "linux/arm64", implementation: "tdlib"} + - {os: ubuntu-18.04, usedocker: "true", arch: "linux/386", implementation: "tdlight"} + - {os: ubuntu-18.04, usedocker: "true", arch: "linux/386", implementation: "tdlib"} + - {os: ubuntu-18.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlight"} + - {os: ubuntu-18.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlib"} + - {os: ubuntu-18.04, usedocker: "true", arch: "linux/arm/v6", implementation: "tdlight"} + - {os: ubuntu-18.04, usedocker: "true", arch: "linux/arm/v6", implementation: "tdlib"} + - {os: ubuntu-18.04, usedocker: "true", arch: "linux/arm/v7", implementation: "tdlight"} + - {os: ubuntu-18.04, usedocker: "true", arch: "linux/arm/v7", implementation: "tdlib"} + - {os: ubuntu-18.04, usedocker: "true", arch: "linux/arm64", implementation: "tdlight"} + - {os: ubuntu-18.04, usedocker: "true", arch: "linux/arm64", implementation: "tdlib"} - {os: windows-2019, usedocker: "false", arch: "amd64", implementation: "tdlight"} - {os: windows-2019, usedocker: "false", arch: "amd64", implementation: "tdlib"} - {os: macos-10.15, usedocker: "false", arch: "amd64", implementation: "tdlight"} diff --git a/implementations/tdlib b/implementations/tdlib index 9964d24..b342ec3 160000 --- a/implementations/tdlib +++ b/implementations/tdlib @@ -1 +1 @@ -Subproject commit 9964d24ec8e03bd0bc4d5fe33438f056d133fc1a +Subproject commit b342ec33e535893312af1ded6a67f8c4f784aee5 diff --git a/implementations/tdlight b/implementations/tdlight index ee7ffd0..903df58 160000 --- a/implementations/tdlight +++ b/implementations/tdlight @@ -1 +1 @@ -Subproject commit ee7ffd085f83223a6752a42537029f3184e8a068 +Subproject commit 903df5899c90f0509cf6f13785bcb8344b317bf1 diff --git a/scripts/continuous-integration/github-workflows/install-dependencies.sh b/scripts/continuous-integration/github-workflows/install-dependencies.sh index 037c4bb..f306be7 100755 --- a/scripts/continuous-integration/github-workflows/install-dependencies.sh +++ b/scripts/continuous-integration/github-workflows/install-dependencies.sh @@ -4,8 +4,8 @@ set -e if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then echo "==Linux====" sudo apt install -y make git zlib1g-dev libssl-dev gperf cmake \ - ccache maven python3 python3-pip php7.4-cli \ - clang-11 libc++-11-dev libc++abi-11-dev + ccache maven python3 python3-pip php7.2-cli \ + clang-10 libc++-10-dev libc++abi-10-dev elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then echo "==OSX======" diff --git a/scripts/continuous-integration/github-workflows/setup-variables.sh b/scripts/continuous-integration/github-workflows/setup-variables.sh index 950c1f0..4d089d2 100644 --- a/scripts/continuous-integration/github-workflows/setup-variables.sh +++ b/scripts/continuous-integration/github-workflows/setup-variables.sh @@ -93,8 +93,8 @@ elif [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then fi export CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++" - export CC="/usr/bin/clang-11" - export CXX="/usr/bin/clang++-11" + export CC="/usr/bin/clang" + export CXX="/usr/bin/clang++" export CPU_CORES=" -- -j${CPU_CORES_NUM}" fi