Merge branch 'main' into startup-schedule-label

bevyengine · Sep 17, 2021 · c71f370 · c71f370
2 parents 9ed663c + 615d43b
commit c71f370
Show file tree

Hide file tree

Showing 48 changed files with 1,623 additions and 335 deletions.
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -1,8 +1,6 @@
 name: PR-Labeler
-on: 
+on:
   pull_request_target:
-    branches:
-      - main
     types:
       - opened
 
@@ -15,4 +13,3 @@ jobs:
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         configuration-path: .github/label-config.yml
-        sync-labels: true
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,6 +50,7 @@ bevy_wgpu = ["bevy_internal/bevy_wgpu"]
 bevy_winit = ["bevy_internal/bevy_winit"]
 
 trace_chrome = ["bevy_internal/trace_chrome"]
+trace_tracy = ["bevy_internal/trace_tracy"]
 trace = ["bevy_internal/trace"]
 wgpu_trace = ["bevy_internal/wgpu_trace"]