Update actions

This commit is contained in:
Andrea Cavalli 2022-03-15 19:30:08 +01:00
parent a877d232e0
commit 085df0ec01
2 changed files with 3 additions and 5 deletions

View File

@ -210,9 +210,7 @@ jobs:
vs-version: '[16.4,16.5)' vs-version: '[16.4,16.5)'
- name: Setup cmake - name: Setup cmake
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
uses: jwlawson/actions-setup-cmake@v1.9 - uses: lukka/get-cmake@v3.21.2
with:
cmake-version: '3.16.x'
- name: Set up Maven - name: Set up Maven
uses: stCarolas/setup-maven@v4.2 uses: stCarolas/setup-maven@v4.2
with: with:
@ -222,7 +220,7 @@ jobs:
uses: ilammy/setup-nasm@v1 uses: ilammy/setup-nasm@v1
- name: Restore artifacts, or setup vcpkg (do not install any package) - name: Restore artifacts, or setup vcpkg (do not install any package)
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
uses: lukka/run-vcpkg@v10.1 uses: lukka/run-vcpkg@v10.2
with: with:
# Just install vcpkg for now, do not install any ports in this step yet. # Just install vcpkg for now, do not install any ports in this step yet.
setupOnly: true setupOnly: true

View File

@ -79,7 +79,7 @@ fi
echo "Configuring CMake..." echo "Configuring CMake..."
mkdir ./generated/td_tools/ mkdir ./generated/td_tools/
cd ./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 # Run cmake to generate common tools
echo "Generating cross compilation tools..." echo "Generating cross compilation tools..."