Merge pull request #1777 from kazasaku/feature/add_ci_vs2022_build_jobs

CIでVS2022を利用したビルドを行うようにする
sakura-editor · Jan 27, 2022 · 68d181d · 68d181d
2 parents df60714 + 949f399
commit 68d181d
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 4 deletions.
diff --git a/.github/workflows/build-sakura.yml b/.github/workflows/build-sakura.yml
@@ -34,10 +34,13 @@ jobs:
   build:
     # The type of runner that the job will run on
     name: MSBuild
-    runs-on: windows-latest
+    runs-on: ${{matrix.os}}
 
     strategy:
       matrix:
+        os:
+          - windows-2019
+          - windows-2022
         config:
           - Debug
           - Release
@@ -89,14 +92,34 @@ jobs:
       run: build-sln.bat ${{ matrix.platform }} ${{ matrix.config }}
       shell: cmd
 
+    - name: Run unit tests
+      run: .\tests1.exe --gtest_output=xml:${{github.workspace}}\tests1.exe-googletest-${{matrix.platform}}-${{matrix.config}}.xml
+      working-directory: ${{github.workspace}}\${{matrix.platform}}\${{matrix.config}}
+      shell: pwsh
+
     - name: Install Locale Emulator
-      run: choco install locale-emulator -y
-      shell: cmd
+      run: |
+        choco install autohotkey.install --confirm
+        $LEExpandDir = "${{github.workspace}}\tools\locale-emulator"
+        $LEInitScript = "${{github.workspace}}\ci\init-locale-emulator.ahk"
+        New-Item "${LEExpandDir}" -ItemType Directory
+        Invoke-WebRequest `
+          "https://github.com/xupefei/Locale-Emulator/releases/download/v2.5.0.1/Locale.Emulator.2.5.0.1.zip" `
+          -OutFile "${LEExpandDir}\locale-emulator.zip"
+        Expand-Archive "${LEExpandDir}\locale-emulator.zip" "${LEExpandDir}"
+        Start-Process "AutoHotKey" "${LEInitScript}"
+        Start-Process "${LEExpandDir}\LEInstaller.exe"
+        echo "${LEExpandDir}" >> $env:GITHUB_PATH
+      shell: pwsh
 
     - name: Build HTML Help
       run: build-chm.bat
       shell: cmd
 
+    - name: Update/Install Inno Setup
+      run: choco upgrade innosetup --confirm
+      shell: pwsh
+
     - name: Build installer with Inno Setup
       run: build-installer.bat ${{ matrix.platform }} ${{ matrix.config }}
       shell: cmd

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -100,6 +100,13 @@ jobs:
     vmImage: 'windows-2019'
     displayName: VS2019
 
+# サクラエディタのビルドを行う JOB (VS2022)
+- template: ci/azure-pipelines/template.job.build-unittest.yml
+  parameters:
+    name: VS2022
+    vmImage: 'windows-2022'
+    displayName: VS2022
+
 # サクラエディタのビルドを行う JOB(MinGW)
 # * サクラエディタ本体
 # * 単体テスト

diff --git a/ci/azure-pipelines/template.job.build-unittest.yml b/ci/azure-pipelines/template.job.build-unittest.yml
@@ -47,13 +47,28 @@ jobs:
     displayName: Bitmap Split/Mux
 
   # Install Locale Emulator
-  - script: choco install locale-emulator -y
+  - pwsh: |
+      choco install autohotkey.install --confirm
+      $LEExpandDir = "$(Build.SourcesDirectory)\tools\locale-emulator"
+      $LEInitScript = "$(Build.SourcesDirectory)\ci\init-locale-emulator.ahk"
+      New-Item "${LEExpandDir}" -ItemType Directory
+      Invoke-WebRequest `
+        "https://github.com/xupefei/Locale-Emulator/releases/download/v2.5.0.1/Locale.Emulator.2.5.0.1.zip" `
+        -OutFile "${LEExpandDir}\locale-emulator.zip"
+      Expand-Archive "${LEExpandDir}\locale-emulator.zip" "${LEExpandDir}"
+      Start-Process "AutoHotKey" "${LEInitScript}"
+      Start-Process "${LEExpandDir}\LEInstaller.exe"
+      echo "##vso[task.prependpath]${LEExpandDir}"
     displayName: Install Locale Emulator
 
   # Build HTML Help
   - script: build-chm.bat
     displayName: Build HTML Help
 
+  # Update/Install Inno Setup
+  - pwsh: choco upgrade innosetup --confirm
+    displayName: Update/Install Inno Setup
+
   # Build installer with Inno Setup
   - script: build-installer.bat $(BuildPlatform) $(Configuration)
     displayName: Build installer with Inno Setup

diff --git a/ci/init-locale-emulator.ahk b/ci/init-locale-emulator.ahk
@@ -0,0 +1,7 @@
+#NoEnv
+#NoTrayIcon
+SetTitleMatchMode, 1
+
+window_title = % "LE Context Menu Installer - V"
+WinWait, %window_title%, , 20
+WinClose %window_title%