From 14161a153e7cacf36d4d5bdb29d0c73ef5922f73 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 9 May 2023 00:38:43 +0200 Subject: [PATCH] update ci --- .github/workflows/platform_natives.yaml | 14 ++- .../scripts/install-deps-linux-arm64-ssl1.sh | 2 +- .github/workflows/tdapi_file.yaml | 6 +- api/pom.xml | 95 ++++++++++++------- tdlib-serializer | 2 +- 5 files changed, 78 insertions(+), 41 deletions(-) diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml index 2ba23bb..2d0706a 100644 --- a/.github/workflows/platform_natives.yaml +++ b/.github/workflows/platform_natives.yaml @@ -31,6 +31,7 @@ jobs: - name: Get version run: | + set -eo pipefail # Get latest commit short hash HASH_VERSION=$(git rev-parse --short HEAD) @@ -124,6 +125,7 @@ jobs: - name: Install custom dependencies shell: bash run: | + set -eo pipefail echo "REVISION: $REVISION" if [[ -f "./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh" ]]; then @@ -175,20 +177,26 @@ jobs: - name: Install vcpkg deps if: matrix.os == 'windows-2019' run: | + set -eo pipefail $VCPKG_DIR/vcpkg install gperf openssl:x64-windows-static zlib:x64-windows-static shell: bash - name: Build shell: bash run: | + set -eo pipefail echo "REVISION: $REVISION" source ./.github/workflows/scripts/build-${SAFE_TYPE}.sh - id: getfilename shell: bash - run: echo "::set-output name=file::$(cd generated/target; ls tdli*-natives-*.jar)" + run: | + set -eo pipefail + echo "::set-output name=file::$(cd generated/target; ls tdli*-natives-*.jar)" - id: getfilepath shell: bash - run: echo "::set-output name=file::$(ls generated/target/tdli*-natives-*.jar)" + run: | + set -eo pipefail + echo "::set-output name=file::$(ls generated/target/tdli*-natives-*.jar)" - uses: actions/upload-artifact@v3 with: name: ${{ steps.getfilename.outputs.file }} @@ -197,6 +205,7 @@ jobs: if: github.ref == 'refs/heads/develop' shell: bash run: | + set -eo pipefail echo "REVISION: $REVISION" echo "SSL TYPE: $SSL_TYPE" @@ -208,6 +217,7 @@ jobs: if: github.ref == 'refs/heads/master' shell: bash run: | + set -eo pipefail echo "REVISION: $REVISION" echo "SSL TYPE: $SSL_TYPE" diff --git a/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh b/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh index 723d824..078fa83 100755 --- a/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh +++ b/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh @@ -27,4 +27,4 @@ dpkg-deb -xv libclang-common-10-dev_*_arm64.deb / # 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 +apt-get --assume-yes install libssl-dev:arm64 zlib1g-dev:arm64 openjdk-8-jdk-headless:arm64 libgcc-9-dev:arm64 libc6-dev:arm64 libunwind-dev:arm64 diff --git a/.github/workflows/tdapi_file.yaml b/.github/workflows/tdapi_file.yaml index 83e0df2..d53c44e 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++-14-dev libc++abi-14-dev libgcc-11-dev libunwind-14-dev libclang-common-14-dev ccache maven + packages: sudo make git zlib1g-dev libssl-dev gperf php-cli cmake openjdk-17-jdk clang-14 libc++-14-dev libc++abi-14-dev libgcc-11-dev libunwind-14-dev libclang-common-14-dev ccache maven version: 1.0 - name: Install SSH key uses: shimataro/ssh-key-action@v2 @@ -50,6 +50,7 @@ jobs: - name: Setup variables shell: bash run: | + set -eo pipefail # ====== Variables export REVISION=${{ github.run_number }} export GH_MATRIX_OS=${{ matrix.os }} @@ -67,6 +68,7 @@ jobs: - name: Build shell: bash run: | + set -eo pipefail echo "REVISION: $REVISION" ./.github/workflows/scripts/build-api.sh @@ -74,6 +76,7 @@ jobs: if: github.ref != 'refs/heads/master' shell: bash run: | + set -eo pipefail echo "REVISION: $REVISION" echo "Deploying legacy package" @@ -87,6 +90,7 @@ jobs: if: github.ref == 'refs/heads/master' shell: bash run: | + set -eo pipefail echo "REVISION: $REVISION" echo "Deploying legacy package" diff --git a/api/pom.xml b/api/pom.xml index 9990952..a09763b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -123,6 +123,22 @@ legacy + + org.apache.maven.plugins + maven-install-plugin + 3.1.1 + + true + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + + true + + @@ -169,6 +185,49 @@ maven-jar-plugin 3.2.0 + + org.apache.maven.plugins + maven-install-plugin + 3.1.1 + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + + + + maven-source-plugin + 3.2.1 + + + attach-sources + + jar + + + + + + maven-javadoc-plugin + 3.2.0 + + + main-javadoc + package + + jar + + + 17 + true + true + UTF-8 + UTF-8 + + + + @@ -202,46 +261,10 @@ maven-resources-plugin 3.0.2 - - maven-source-plugin - 3.2.1 - - - attach-sources - - jar - - - - - - maven-javadoc-plugin - 3.2.0 - - - main-javadoc - package - - jar - - - 17 - true - true - UTF-8 - UTF-8 - - - - maven-install-plugin 3.0.0-M1 - - maven-deploy-plugin - 2.8.2 - com.outbrain.swinfra ci-friendly-flatten-maven-plugin diff --git a/tdlib-serializer b/tdlib-serializer index c77baa4..b325147 160000 --- a/tdlib-serializer +++ b/tdlib-serializer @@ -1 +1 @@ -Subproject commit c77baa48e306371c5a188c49b553003539132eb5 +Subproject commit b32514771e84e4df39b33fe07f4bb93a7b32541d