Merge branch 'main' into refactoring/VOICEVOX#2234

.eslintrc.js

@@ -44,11 +44,7 @@ module.exports = {
   plugins: ["import"],
   parser: vueEslintParser,
   parserOptions: vueEslintParserOptions,
-  ignorePatterns: [
-    "dist/**/*",
-    "dist_*/**/*",
-    "node_modules/**/*",
-  ],
+  ignorePatterns: ["dist/**/*", "dist_*/**/*", "node_modules/**/*"],
   rules: {
     "linebreak-style":
       process.env.NODE_ENV === "production" && process.platform !== "win32"
@@ -63,17 +59,6 @@ module.exports = {
         endOfLine: "auto",
       },
     ],
-    "vue/no-restricted-syntax": [
-      "error",
-      {
-        selector: "LogicalExpression[operator=??]",
-        message: `template内で"??"を使うとgithubのsyntax highlightが崩れるので\n三項演算子等を使って書き換えてください`,
-      },
-      {
-        selector: "MemberExpression[optional=true]",
-        message: `template内で"?."を使うとgithubのsyntax highlightが崩れるので\n三項演算子等を使って書き換えてください`,
-      },
-    ],
     "@typescript-eslint/no-unused-vars": [
       process.env.NODE_ENV === "development" ? "warn" : "error", // 開発時のみwarn
       {

.github/workflows/build.yml

@@ -120,7 +120,7 @@ jobs:
             app_asar_dir: prepackage/VOICEVOX.app/Contents/Resources
             installer_artifact_name: macos-x64-cpu-dmg
             macos_artifact_name: "VOICEVOX.${version}-x64.${ext}"
-            os: macos-12
+            os: macos-13
           # macOS CPU (arm64)
           - artifact_name: macos-arm64-cpu-prepackage
             artifact_path: dist_electron/mac-arm64

.github/workflows/test.yml

@@ -155,9 +155,12 @@ jobs:
       - name: Collect patch for snapshots
         if: needs.config.outputs.shouldUpdateSnapshots == 'true'
         run: |
-          git add --intent-to-add tests/  # git diff に表示されるようにする
-          git diff tests/  # ロギング用
-          git diff --binary tests/ > patch-${{ matrix.os }}.diff
+          # ログ用
+          git status
+
+          # git diff に表示されるようにする
+          git add --intent-to-add --all tests/
+          git diff --binary HEAD tests/ > patch-${{ matrix.os }}.diff
 
       - name: Upload patch to artifact
         if: needs.config.outputs.shouldUpdateSnapshots == 'true'
@@ -184,14 +187,14 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           pattern: updated-snapshots-*
-          path: patches
+          path: ${{ runner.temp }}/patches
           merge-multiple: true
 
       - name: Commit updated snapshots
         id: commit-updated-snapshots
         run: |
           # パッチを適用
-          for patch in patches/*.diff; do
+          for patch in ${{ runner.temp }}/patches/*.diff; do
             git apply --allow-empty $patch
             rm $patch
           done