Przeglądaj źródła

Changes according to review

Ivan Savenko 1 rok temu
rodzic
commit
ccd0edf13d
3 zmienionych plików z 4 dodań i 3 usunięć
  1. 2 2
      .github/workflows/github.yml
  2. 1 1
      CI/before_install/mingw.sh
  3. 1 0
      conanfile.py

+ 2 - 2
.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
 

+ 1 - 1
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
+sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix

+ 1 - 0
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: