From e1c1e568f95c55fcb1851ad177d9fb9750e6df18 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 7 May 2023 18:03:58 +0200 Subject: [PATCH] Update clang --- .github/workflows/platform_natives.yaml | 8 ++++---- .github/workflows/scripts/build-linux-amd64-ssl1.sh | 4 ++-- .github/workflows/scripts/build-linux-arm64-ssl1.sh | 4 ++-- .github/workflows/tdapi_file.yaml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml index d32fb30..7e861d5 100644 --- a/.github/workflows/platform_natives.yaml +++ b/.github/workflows/platform_natives.yaml @@ -1,4 +1,4 @@ -name: Docker multi-arch build +name: multi-arch build on: push: @@ -8,7 +8,7 @@ on: jobs: build: - name: Build (${{ matrix.type }} on ${{ matrix.os }} + name: ${{ matrix.type }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: @@ -125,13 +125,13 @@ jobs: if: matrix.os == 'ubuntu-20.04' uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-10 lld-10 libc++-dev libc++abi-dev ccache + packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-10 lld-10 libc++-dev libc++abi-dev ccache maven version: 1.0 - name: Install ubuntu 22.04 dependencies if: matrix.os == 'ubuntu-22.04' uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 lld-14 libc++-dev libc++abi-dev ccache + packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 lld-14 libc++-dev libc++abi-dev ccache maven version: 1.0 - name: Install MSVC if: matrix.os == 'windows-2019' diff --git a/.github/workflows/scripts/build-linux-amd64-ssl1.sh b/.github/workflows/scripts/build-linux-amd64-ssl1.sh index f9e469a..a48c8f9 100755 --- a/.github/workflows/scripts/build-linux-amd64-ssl1.sh +++ b/.github/workflows/scripts/build-linux-amd64-ssl1.sh @@ -7,8 +7,8 @@ rm -rf implementations/tdlight/td_tools_build implementations/tdlight/build api/ mkdir -p implementations/tdlight/build implementations/tdlight/build/td_bin/bin implementations/tdlight/td_tools_build/java/it/tdlight/jni api/src/main/java-legacy/it/tdlight/jni api/src/main/java-sealed/it/tdlight/jni natives/src/main/java/it/tdlight/jni natives/build natives/tdjni_bin natives/tdjni_docs # machine-specific flags -HOST_CMAKE_C_COMPILER="/usr/bin/clang-10" -HOST_CMAKE_CXX_COMPILER="/usr/bin/clang++-10" +HOST_CMAKE_C_COMPILER="/usr/bin/clang-12" +HOST_CMAKE_CXX_COMPILER="/usr/bin/clang++-12" HOST_CMAKE_C_FLAGS="-fuse-ld=lld -Wno-psabi --specs=nosys.specs -fdata-sections -ffunction-sections -Wl,--gc-sections" HOST_CMAKE_CXX_FLAGS="${HOST_CMAKE_C_FLAGS} -stdlib=libc++ -fno-exceptions" HOST_CMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -lc++ -lc++abi" diff --git a/.github/workflows/scripts/build-linux-arm64-ssl1.sh b/.github/workflows/scripts/build-linux-arm64-ssl1.sh index f784e8f..8fbf19b 100755 --- a/.github/workflows/scripts/build-linux-arm64-ssl1.sh +++ b/.github/workflows/scripts/build-linux-arm64-ssl1.sh @@ -8,8 +8,8 @@ rm -rf implementations/tdlight/td_tools_build implementations/tdlight/build api/ mkdir -p implementations/tdlight/build implementations/tdlight/build/td_bin/bin implementations/tdlight/td_tools_build/java/it/tdlight/jni api/src/main/java-legacy/it/tdlight/jni api/src/main/java-sealed/it/tdlight/jni natives/src/main/java/it/tdlight/jni natives/build natives/tdjni_bin natives/tdjni_docs # machine-specific flags -HOST_CMAKE_C_COMPILER="/usr/bin/clang-10" -HOST_CMAKE_CXX_COMPILER="/usr/bin/clang++-10" +HOST_CMAKE_C_COMPILER="/usr/bin/clang-12" +HOST_CMAKE_CXX_COMPILER="/usr/bin/clang++-12" HOST_CMAKE_C_FLAGS="-fuse-ld=lld -Wno-psabi --specs=nosys.specs -fdata-sections -ffunction-sections -Wl,--gc-sections" HOST_CMAKE_CXX_FLAGS="${HOST_CMAKE_C_FLAGS} -stdlib=libc++ -fno-exceptions" HOST_CMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -lc++ -lc++abi" diff --git a/.github/workflows/tdapi_file.yaml b/.github/workflows/tdapi_file.yaml index 591896d..614091c 100644 --- a/.github/workflows/tdapi_file.yaml +++ b/.github/workflows/tdapi_file.yaml @@ -18,7 +18,7 @@ jobs: if: matrix.os == 'ubuntu-22.04' uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: sudo make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 libc++-dev libc++abi-dev + packages: sudo make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 libc++-dev libc++abi-dev maven version: 1.0 - name: Install SSH key uses: shimataro/ssh-key-action@v2