Merge pull request #77 from inkandswitch/upgrade-automerge-0.7

Upgrade to automerge 0.7

Author: nikitalita

.github/workflows/all_editor_builds.yml

@@ -5,10 +5,10 @@ on:
 # Global Settings
 # SCONS_CACHE for windows must be set in the build environment
 env:
-  GODOT_REPOSITORY: nikitalita/godot
+  GODOT_REPOSITORY: godotengine/godot
   GODOT_BASE_BRANCH: master
-  # Change the README too
-  GODOT_MAIN_SYNC_REF: patchwork-update-4.6
+  # Change Developers.md too
+  GODOT_MAIN_SYNC_REF: bb92a4c8e27e30cdec05ab6d540d724b9b3cfb72
   SCONSFLAGS: verbose=yes warnings=all werror=no module_text_server_fb_enabled=yes minizip=yes deprecated=yes module_patchwork_editor_enabled=yes
   SCONSFLAGS_TEMPLATE: no_editor_splash=yes module_camera_enabled=no module_mobile_vr_enabled=no module_upnp_enabled=no module_websocket_enabled=no module_csg_enabled=yes module_gridmap_enabled=yes use_static_cpp=yes builtin_freetype=yes builtin_libpng=yes builtin_zlib=yes builtin_libwebp=yes builtin_libvorbis=yes builtin_libogg=yes disable_3d=no
   SCONS_CACHE_MSVC_CONFIG: true

Cargo.lock

@@ -4,3 +4,17 @@ members = [
     "rust/plugin",
 ]
 
+
+# create profile release_debug
+[profile.release_debug]
+inherits = "release"
+opt-level = 0
+debug = true
+lto = false
+panic = "abort"
+codegen-units = 1
+panic-strategy = "abort"
+#config flag "release_debug"
+
+# set release_debug as default profile
+default = ["release_debug"]

Cargo.toml

@@ -28,7 +28,8 @@ If any are missing, see [Detailed Setup](#detailed-setup) below.
 
 ```bash
 # Clone custom Godot fork
-git clone -b patchwork-4.6 https://github.com/nikitalita/godot
+git clone -b master https://github.com/godotengine/godot
+git checkout bb92a4c8e27e30cdec05ab6d540d724b9b3cfb72
 cd godot
 
 # Clone plugin into modules/