fix CI on windows

soramimi · Jun 1, 2024 · bb811c8 · bb811c8
1 parent 61c3805
commit bb811c8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/RELEASE-WINDOWS.rb b/RELEASE-WINDOWS.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 
-$qt = "C:/Qt/6.5.2/msvc2019_64"
-$windeployqt = "C:/Qt/6.5.2/msvc2019_64/bin/windeployqt.exe"
+$qt = "C:/Qt/6.6.3/msvc2019_64"
+$windeployqt = "C:/Qt/6.6.3/msvc2019_64/bin/windeployqt.exe"
 #$qt = "" # スタティックリンクのとき
 
 $openssl = "C:/Program Files/OpenSSL"
@@ -11,7 +11,7 @@
 load 'version.rb'
 
 $workdir = "_release"
-$dstdir = $workdir + "/" + $product_name
+$dstdir = $workdir + "/soramimi.jp/" + $product_name
 
 FileUtils.rm_rf($workdir)
 FileUtils.mkpath($dstdir)
@@ -31,6 +31,6 @@
 pkgfilename = "#{$product_name}-#{$version_a}.#{$version_b}.#{$version_c}-win32.zip"
 
 Dir.chdir($workdir) {
-	`7z a #{pkgfilename} #{$product_name}`
+	`7z a #{pkgfilename} soramimi.jp`
 }
 
diff --git a/ci/ci-windows.bat b/ci/ci-windows.bat
@@ -1,2 +1,2 @@
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
 ruby packaging\win\deploy.rb
diff --git a/packaging/win/deploy.rb b/packaging/win/deploy.rb
@@ -22,8 +22,8 @@ def run(cmd)
 run "git clone https://github.com/madler/zlib"
 FileUtils.cp "../../zlib.pro", "zlib/"
 Dir.chdir("zlib") {
-	run "C:/Qt/6.5.2/msvc2019_64/bin/qmake.exe CONFIG+=release zlib.pro"
-	run "C:/Qt/Tools/QtCreator/bin/jom.exe"
+	run "C:/Qt/6.6.3/msvc2019_64/bin/qmake.exe CONFIG+=release zlib.pro"
+	run "C:/Qt/Tools/QtCreator/bin/jom/jom.exe"
 }
 ENV["INCLUDE"] = $script_dir + "/zlib;" + ENV["INCLUDE"]
 
@@ -34,23 +34,14 @@ def run(cmd)
 FileUtils.cp $script_dir + "/zlib/_bin/libz.lib", "_bin/"
 
 mkcd $script_dir + "/build"
-run "C:/Qt/6.5.2/msvc2019_64/bin/qmake.exe CONFIG+=release ../../../Guitar.pro"
-run "C:/Qt/Tools/QtCreator/bin/jom.exe"
+run "C:/Qt/6.6.3/msvc2019_64/bin/qmake.exe CONFIG+=release ../../../Guitar.pro"
+run "C:/Qt/Tools/QtCreator/bin/jom/jom.exe"
 
 Dir.chdir $script_dir + "/../../"
 run "ruby RELEASE-WINDOWS.rb"
 
-Dir.chdir $script_dir
-load '../../version.rb'
+load 'version.rb'
 
 pkgname = "Guitar-#{$version_a}.#{$version_b}.#{$version_c}-win32.zip"
 
-run "7z x ../../_release/#{pkgname} -opackages/jp.soramimi.guitar"
-
-mkcd $script_dir + "/packages/jp.soramimi.guitar"
-FileUtils.mv "Guitar", "data"
-
-Dir.chdir $script_dir
-run "C:/Qt/QtIFW-3.2.2/bin/binarycreator.exe -c config/config.xml -p packages GuitarSetup.exe"
-
-run "curl -T GuitarSetup.exe ftp://192.168.0.5:/Public/pub/nightlybuild/"
+run "curl -T _release/#{pkgname} ftp://192.168.0.5:/Public/pub/nightlybuild/"