From 085df0ec01bcf87b4466f602e14010f9ae9dbe98 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 15 Mar 2022 19:30:08 +0100 Subject: [PATCH] Update actions --- .github/workflows/platform_natives.yaml | 6 ++---- scripts/core/generate_td_tools.sh | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml index 4ff996a..9c231d9 100644 --- a/.github/workflows/platform_natives.yaml +++ b/.github/workflows/platform_natives.yaml @@ -210,9 +210,7 @@ jobs: vs-version: '[16.4,16.5)' - name: Setup cmake if: matrix.os == 'windows-latest' - uses: jwlawson/actions-setup-cmake@v1.9 - with: - cmake-version: '3.16.x' + - uses: lukka/get-cmake@v3.21.2 - name: Set up Maven uses: stCarolas/setup-maven@v4.2 with: @@ -222,7 +220,7 @@ jobs: uses: ilammy/setup-nasm@v1 - name: Restore artifacts, or setup vcpkg (do not install any package) if: matrix.os == 'windows-latest' - uses: lukka/run-vcpkg@v10.1 + uses: lukka/run-vcpkg@v10.2 with: # Just install vcpkg for now, do not install any ports in this step yet. setupOnly: true diff --git a/scripts/core/generate_td_tools.sh b/scripts/core/generate_td_tools.sh index c7fcd80..00e9ba5 100755 --- a/scripts/core/generate_td_tools.sh +++ b/scripts/core/generate_td_tools.sh @@ -79,7 +79,7 @@ fi echo "Configuring CMake..." mkdir ./generated/td_tools/ cd ./generated/td_tools/ -cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DTD_ENABLE_LTO=ON ${CMAKE_EXTRA_ARGUMENTS} ../implementation/ +cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON ${CMAKE_EXTRA_ARGUMENTS} ../implementation/ # Run cmake to generate common tools echo "Generating cross compilation tools..."