Merge branch 'main' into feat/4d-gaussians

mosure · Feb 2, 2024 · eaee7f4 · eaee7f4
2 parents 633606c + d4ddbdd
commit eaee7f4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest]
+        os: [windows-latest, macos-latest, macos-14]
 
     runs-on: ${{ matrix.os }}
     timeout-minutes: 120

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest]
+        os: [windows-latest, macos-latest, macos-14]
         rust-toolchain:
           - nightly
 
@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest]
+        os: [windows-latest, macos-latest, macos-14]
         rust-toolchain:
           - nightly
 

diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest]
+        os: [windows-latest, macos-latest, macos-14]
         rust-toolchain:
           - nightly
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest]
+        os: [windows-latest, macos-latest, macos-14]
         rust-toolchain:
           - nightly
 
@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest]
+        os: [windows-latest, macos-latest, macos-14]
         rust-toolchain:
           - nightly
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -135,7 +135,7 @@ bevy_args = { version = "1.2.0", optional = true }
 bevy-inspector-egui = { version = "0.22", optional = true }
 bevy_mod_picking = { version = "0.17", optional = true }
 bevy_panorbit_camera = { version = "0.10", optional = true }
-bevy_transform_gizmo = { version = "0.9", optional = true }
+bevy_transform_gizmo = { version = "0.10", optional = true }
 bincode2 = { version = "2.0", optional = true }
 byte-unit = { version = "5.0", optional = true }
 bytemuck = "1.14"