From ccd0edf13d5e9ff0cb0227eaa0c467d93f617bea Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 14 Oct 2024 13:23:48 +0000 Subject: [PATCH] Changes according to review --- .github/workflows/github.yml | 4 ++-- CI/before_install/mingw.sh | 2 +- conanfile.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml index 6d93ca4ad..1fec92b84 100644 --- a/.github/workflows/github.yml +++ b/.github/workflows/github.yml @@ -269,8 +269,8 @@ jobs: # Workaround for CPack bug on macOS 13 counter=0 - until cpack -C ${{matrix.pack_type}} || ((counter > 20)) - do sleep 3 + until cpack -C ${{matrix.pack_type}} || ((counter > 20)); do + sleep 3 ((counter++)) done diff --git a/CI/before_install/mingw.sh b/CI/before_install/mingw.sh index 2d01d179e..30a865d49 100644 --- a/CI/before_install/mingw.sh +++ b/CI/before_install/mingw.sh @@ -4,4 +4,4 @@ sudo apt-get update sudo apt-get install ninja-build mingw-w64 nsis sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix -sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix \ No newline at end of file +sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix diff --git a/conanfile.py b/conanfile.py index 6e3ac8a35..302aba724 100644 --- a/conanfile.py +++ b/conanfile.py @@ -70,6 +70,7 @@ class VCMI(ConanFile): self.requires("sdl_mixer/2.0.4") elif self.settings.os == "Android": # On Android SDL version must be same as version of Java wrapper for SDL in VCMI source code + # Wrapper can be found in following directory: android/vcmi-app/src/main/java/org/libsdl/app self.requires("sdl/2.26.5") self.requires("sdl_mixer/2.0.4") else: