From 93e61fbef1e90eb30264d8da5625be954c7bbdf9 Mon Sep 17 00:00:00 2001 From: GengGode <47711102+GengGode@users.noreply.github.com> Date: Wed, 6 Jul 2022 19:54:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?chore.AppVeyor=E4=B8=8D=E5=86=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81Qt5.14=EF=BC=8C=E6=94=B9=E4=B8=BA5.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b962a90..00eceaa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,10 +8,10 @@ branches: - master environment: - qt: 5.14 + qt: 5.13 msvc: msvc2017 vs: C:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\Community\VC\Auxiliary\Build - QTDIR: C:\Qt\5.14.2\msvc2017_64 + QTDIR: C:\Qt\5.13.2\msvc2017_64 ProjectName: GenshinImpactNaturalLaw ProJectExeName: TianLi_Launcher MyProjectDir: C:\projects\%ProjectName% From 8915a54c974995beb072ead4d600b9ef79782ba5 Mon Sep 17 00:00:00 2001 From: GengGode <47711102+GengGode@users.noreply.github.com> Date: Wed, 6 Jul 2022 19:56:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?chore.=E5=B0=9D=E8=AF=95=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=BC=96=E8=AF=91=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 00eceaa..283c110 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,6 +20,7 @@ environment: skip_tags: true before_build: + - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) #- set PATH=%PATH%;%QTDIR%\bin; #- set vcvarsall=%vs%\vcvarsall.bat #- call "%vcvarsall%" x64 @@ -49,7 +50,7 @@ after_build: - cd %MyProjectDir%\x64\build\ - windeployqt %ProJectExeName%.exe - #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + - echo %APPVEYOR_BUILD_VERSION% >version.tag - 7z a source.7z %MyProjectDir%\x64\build\* From 5b2dfe2226a7e438e87454e26c0db2182a9b93e7 Mon Sep 17 00:00:00 2001 From: GengGode <47711102+GengGode@users.noreply.github.com> Date: Wed, 6 Jul 2022 19:59:20 +0800 Subject: [PATCH 3/6] =?UTF-8?q?chore.=E9=99=8D=E4=B8=BAVS2017?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 283c110..e2ad25c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ version: '1.0.{build}' -image: Visual Studio 2019 +image: Visual Studio 2017 configuration: Release platform: - x64 From cc95e81f636b3cd7f647fd37891291016644a025 Mon Sep 17 00:00:00 2001 From: GengGode <47711102+GengGode@users.noreply.github.com> Date: Wed, 6 Jul 2022 20:02:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?chore.=E9=85=8D=E7=BD=AEVS2017=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e2ad25c..8f4cb2b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ branches: environment: qt: 5.13 msvc: msvc2017 - vs: C:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\Community\VC\Auxiliary\Build + vs: C:\"Program Files (x86)"\"Microsoft Visual Studio"\2017\Community\VC\Auxiliary\Build QTDIR: C:\Qt\5.13.2\msvc2017_64 ProjectName: GenshinImpactNaturalLaw ProJectExeName: TianLi_Launcher From b654871dd7fc172ddd43a2e65fdacaf2bd63cb53 Mon Sep 17 00:00:00 2001 From: GengGode <47711102+GengGode@users.noreply.github.com> Date: Thu, 7 Jul 2022 01:10:33 +0800 Subject: [PATCH 5/6] =?UTF-8?q?chore.=E8=BF=98=E5=8E=9F=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=BF=9C=E7=A8=8B=E6=A1=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8f4cb2b..703319d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ environment: skip_tags: true before_build: - - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) #- set PATH=%PATH%;%QTDIR%\bin; #- set vcvarsall=%vs%\vcvarsall.bat #- call "%vcvarsall%" x64 From 58891f1fc5530f2f82294a0a9dfbd9c6365bf74e Mon Sep 17 00:00:00 2001 From: Yu SuiXian <47711102+GengGode@users.noreply.github.com> Date: Fri, 16 Dec 2022 14:36:53 +0800 Subject: [PATCH 6/6] Create windows.yml --- .github/workflows/windows.yml | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 0000000..5f72435 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,53 @@ +name: MSBuild + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +env: + # Path to the solution file relative to the root of the project. + SOLUTION_FILE_PATH: . + + # Configuration type to build. + # You can convert this to a build matrix if you need coverage of multiple configuration types. + # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + BUILD_CONFIGURATION: Release + +permissions: + contents: read + +jobs: + build: + runs-on: windows-latest + env: + Qt_Dir_Static : D:/a/GenshinTianLiBattleClient/GenshinTianLiBattleClient/deps_qt/5.15.7/ + + steps: + - uses: actions/checkout@v3 + - name: Add Deps_Qt + run: | + git clone http://github.com/GenshinTianLiBattle/deps_qt.git + cd deps_qt + .\unzip.bat + Copy-Item -Path "openssl" -Destination "C:\" -Recurse + cd .. + dir + copy deps_qt/QtMsBuild.7z GenshinImpact_TianLi/ + copy deps_qt/7z.exe GenshinImpact_TianLi/ + copy deps_qt/7z.dll GenshinImpact_TianLi/ + cd GenshinImpact_TianLi + 7z.exe x QtMsBuild.7z + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v1.0.2 + + - name: Restore NuGet packages + working-directory: ${{env.GITHUB_WORKSPACE}} + run: nuget restore ${{env.SOLUTION_FILE_PATH}} + + - name: Build + working-directory: ${{env.GITHUB_WORKSPACE}} + # Add additional options to the MSBuild command line here (like platform or verbosity level). + # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference + run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}