mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-23 18:06:26 -07:00
comments + choco flag
This commit is contained in:
parent
4cfea8dd57
commit
de6e16e2ff
3 changed files with 4 additions and 4 deletions
2
.github/workflows/desktop-build.yml
vendored
2
.github/workflows/desktop-build.yml
vendored
|
|
@ -422,7 +422,7 @@ jobs:
|
||||||
- name: "[Windows] Install NSIS"
|
- name: "[Windows] Install NSIS"
|
||||||
if: matrix.os == 'Windows'
|
if: matrix.os == 'Windows'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: choco install nsis
|
run: choco install nsis --no-progress
|
||||||
|
|
||||||
- name: "Setup vcpkg cache"
|
- name: "Setup vcpkg cache"
|
||||||
id: vcpkg-cache
|
id: vcpkg-cache
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ declare -i schema_ver="${version_line%%)*}"
|
||||||
latest_migration="$(ls -1 servatrice/migrations/ | tail -n1)"
|
latest_migration="$(ls -1 servatrice/migrations/ | tail -n1)"
|
||||||
xtoysql="${latest_migration#servatrice_}"
|
xtoysql="${latest_migration#servatrice_}"
|
||||||
xtoy="${xtoysql%.sql}"
|
xtoy="${xtoysql%.sql}"
|
||||||
declare -i old_ver="10#${xtoy%_to_*}" #declare as integer with base 10, numbers with a leading 0 are normally interpreted as base 16
|
declare -i old_ver="10#${xtoy%_to_*}" # declare as integer with base 10, numbers with a leading 0 are normally interpreted as base 16
|
||||||
declare -i new_ver="10#${xtoy#*_to_}"
|
declare -i new_ver="10#${xtoy#*_to_}"
|
||||||
|
|
||||||
if ((old_ver >= new_ver)); then
|
if ((old_ver >= new_ver)); then
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,9 @@ add_test(NAME server_card_counter_test COMMAND server_card_counter_test)
|
||||||
add_test(NAME server_counter_test COMMAND server_counter_test)
|
add_test(NAME server_counter_test COMMAND server_counter_test)
|
||||||
|
|
||||||
add_test(NAME deck_hash_performance_test COMMAND deck_hash_performance_test)
|
add_test(NAME deck_hash_performance_test COMMAND deck_hash_performance_test)
|
||||||
|
set_tests_properties(dummy_test PROPERTIES TIMEOUT 5)
|
||||||
set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 5)
|
set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 5)
|
||||||
|
|
||||||
# Find GTest
|
|
||||||
|
|
||||||
add_executable(dummy_test dummy_test.cpp)
|
add_executable(dummy_test dummy_test.cpp)
|
||||||
add_executable(expression_test expression_test.cpp)
|
add_executable(expression_test expression_test.cpp)
|
||||||
add_executable(clamped_arithmetic_test clamped_arithmetic_test.cpp)
|
add_executable(clamped_arithmetic_test clamped_arithmetic_test.cpp)
|
||||||
|
|
@ -24,6 +23,7 @@ add_executable(deck_hash_performance_test deck_hash_performance_test.cpp)
|
||||||
add_executable(server_card_counter_test server_card_counter_test.cpp)
|
add_executable(server_card_counter_test server_card_counter_test.cpp)
|
||||||
add_executable(server_counter_test server_counter_test.cpp)
|
add_executable(server_counter_test server_counter_test.cpp)
|
||||||
|
|
||||||
|
# Find GTest
|
||||||
find_package(GTest)
|
find_package(GTest)
|
||||||
|
|
||||||
if(NOT GTEST_FOUND)
|
if(NOT GTEST_FOUND)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue