From 52bf29d34b5527286094e21b1e4cc43b0d27e892 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Mon, 8 May 2023 14:33:32 +0200 Subject: [PATCH] Enable ci --- ...es.yaml.disabled => platform_natives.yaml} | 20 +++++++++---------- .../scripts/install-deps-linux-arm64-ssl1.sh | 12 ++++++++++- ...api_file.yaml.disabled => tdapi_file.yaml} | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) rename .github/workflows/{platform_natives.yaml.disabled => platform_natives.yaml} (98%) rename .github/workflows/{tdapi_file.yaml.disabled => tdapi_file.yaml} (99%) diff --git a/.github/workflows/platform_natives.yaml.disabled b/.github/workflows/platform_natives.yaml similarity index 98% rename from .github/workflows/platform_natives.yaml.disabled rename to .github/workflows/platform_natives.yaml index 627a7a6..1c2d671 100644 --- a/.github/workflows/platform_natives.yaml.disabled +++ b/.github/workflows/platform_natives.yaml @@ -121,17 +121,25 @@ jobs: with: php-version: '8.0' extensions: readline + - name: Install custom dependencies + shell: bash + run: | + echo "REVISION: $REVISION" + + if [[ -f "./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh" ]]; then + source ./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh + fi - name: Install ubuntu 20.04 dependencies 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++-10-dev libc++abi-10-dev ccache maven + packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-10 lld-10 libc++-10-dev libc++abi-10-dev libgcc-9-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++-14-dev libc++abi-14-dev ccache maven + packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 lld-14 libc++-14-dev libc++abi-14-dev libgcc-11-dev ccache maven version: 1.0 - name: Install MSVC if: matrix.os == 'windows-2019' @@ -169,14 +177,6 @@ jobs: run: | $VCPKG_DIR/vcpkg install gperf openssl:x64-windows-static zlib:x64-windows-static shell: bash - - name: Install deps - shell: bash - run: | - echo "REVISION: $REVISION" - - if [[ -f "./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh" ]]; then - source ./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh - fi - name: Build shell: bash run: | diff --git a/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh b/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh index ffaeb1b..902086c 100755 --- a/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh +++ b/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh @@ -10,5 +10,15 @@ echo "deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main echo "deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs)-security main universe restricted multiverse" >> /etc/apt/sources.list apt-get --assume-yes update -apt-get --assume-yes install libssl-dev:arm64 zlib1g-dev:arm64 openjdk-8-jdk-headless:arm64 +# Install and bypass a bug in the cross-platform libc++ packages +apt-get --assume-yes autoremove libc++-10-dev libc++abi-10-dev +apt-get --assume-yes install libc++-10-dev:arm64 libc++abi-10-dev:arm64 +cp --remove-destination /usr/lib/llvm-10/lib/libc++.so.1.0 /usr/lib/aarch64-linux-gnu/ +cp --remove-destination /usr/lib/llvm-10/lib/libc++abi.so.1.0 /usr/lib/aarch64-linux-gnu/ +cp --remove-destination /usr/lib/llvm-10/lib/libc++abi.so /usr/lib/aarch64-linux-gnu/ +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-10-dev libc++abi-10-dev +# End libc++ packages bugfix + +# Install dependencies +apt-get --assume-yes install libssl-dev:arm64 zlib1g-dev:arm64 openjdk-8-jdk-headless:arm64 libgcc-9-dev:arm64 libc6-dev:arm64 diff --git a/.github/workflows/tdapi_file.yaml.disabled b/.github/workflows/tdapi_file.yaml similarity index 99% rename from .github/workflows/tdapi_file.yaml.disabled rename to .github/workflows/tdapi_file.yaml index 5607d97..a3dd4c9 100644 --- a/.github/workflows/tdapi_file.yaml.disabled +++ 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++-14-dev libc++abi-14-dev ccache maven + packages: sudo make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 libc++-14-dev libc++abi-14-dev libgcc-11-dev ccache maven version: 1.0 - name: Install SSH key uses: shimataro/ssh-key-action@v2