Merge pull request #343 from ioriayane/Release/v0.45.1

Release/v0.45.1
ioriayane · Jan 23, 2025 · 05b86dd · 05b86dd
2 parents 8a2090a + fb841ef
commit 05b86dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -35,7 +35,8 @@ jobs:
           target: 'desktop'
           arch: 'win64_msvc2022_64'
           modules: 'qt5compat qtwebsockets qthttpserver qtshadertools qtimageformats qtscxml'
-          tools: 'tools_opensslv3_x64 tools_opensslv3_src tools_ninja tools_qtcreator_gui,qt.tools.qtcreator_gui'
+          tools: 'tools_opensslv3_x64 tools_opensslv3_src tools_ninja'
+          # tools_qtcreator_gui,qt.tools.qtcreator_gui なぜかChecksumエラーになる
       - name: Checkout repository
         uses: actions/checkout@v4
         with:

diff --git a/scripts/build.bat b/scripts/build.bat
@@ -59,7 +59,12 @@ cd %BUILD_FOLDER%
 qmake ..\Hagoromo.pro CONFIG+=HAGOROMO_RELEASE_BUILD
 if NOT ERRORLEVEL 0 goto QUIT
 
+jom /version
+if ERRORLEVEL 1 (
+nmake
+) else (
 jom
+)
 if NOT ERRORLEVEL 0 goto QUIT
 
 cd %CWD%