Merge remote-tracking branch 'upstream/release-0.15' into merge-upstr…

…eam-release-0.15
VOICEVOX · Aug 7, 2024 · d9269de · d9269de
2 parents 653f5b7 + 87df545
commit d9269de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -72,13 +72,13 @@ jobs:
             artifact_name: linux-arm64-cpu
             whl_local_version: cpu
             use_cuda: false
-          - os: macos-11
+          - os: macos-12
             features: ""
             target: aarch64-apple-darwin
             artifact_name: osx-arm64-cpu
             whl_local_version: cpu
             use_cuda: false
-          - os: macos-11
+          - os: macos-12
             features: ""
             target: x86_64-apple-darwin
             artifact_name: osx-x64-cpu
@@ -109,7 +109,7 @@ jobs:
       - name: Install cargo-edit
         if: ${{ env.VERSION != 'DEBUG' }}
         shell: bash
-        run: cargo binstall cargo-edit@^0.11 --no-confirm --log-level debug
+        run: cargo binstall cargo-edit@^0.11 --no-confirm --log-level debug --locked # NOTE: release-0.15で追加
       - name: set cargo version
         if: ${{ env.VERSION != 'DEBUG' }}
         shell: bash
@@ -209,10 +209,10 @@ jobs:
             os: ubuntu-20.04
           - name: download-osx-x64
             target: x86_64-apple-darwin
-            os: macos-11
+            os: macos-12
           - name: download-osx-arm64
             target: aarch64-apple-darwin
-            os: macos-11
+            os: macos-12
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -80,10 +80,10 @@ jobs:
             features: directml
           - os: windows-2022
             features: directml
-          - os: macos-11
-            features: ""
           - os: macos-12
             features: ""
+          - os: macos-13
+            features: ""
           - os: ubuntu-20.04
             features: ""
           - os: ubuntu-22.04