From 6680e1e9feda6d7cc1bd1bc2c8745515c7917d3a Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 17 Nov 2023 11:46:25 +0200
Subject: [PATCH 01/17] Create new Zed release channel: nightly

---
 .github/workflows/ci.yml              |  6 +++-
 crates/auto_update/src/auto_update.rs | 41 ++++++++++++++-------------
 crates/client/src/client.rs           | 24 ++++++++++------
 crates/client/src/telemetry.rs        |  2 +-
 crates/client2/src/client2.rs         | 22 ++++++++------
 crates/client2/src/telemetry.rs       |  2 +-
 crates/util/src/channel.rs            | 19 +++++++++++++
 crates/zed/Cargo.toml                 | 10 ++++++-
 crates/zed/src/only_instance.rs       |  2 ++
 crates/zed2/Cargo.toml                |  9 ++++++
 crates/zed2/src/only_instance.rs      |  2 ++
 script/bump-zed-minor-versions        |  5 ++--
 script/bump-zed-patch-version         |  5 +++-
 script/deploy                         |  1 +
 script/deploy-migration               |  3 +-
 script/what-is-deployed               |  1 +
 16 files changed, 111 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 60dc4c1f52..39b49da8ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -130,6 +130,8 @@ jobs:
               expected_tag_name="v${version}";;
             preview)
               expected_tag_name="v${version}-pre";;
+            nightly)
+              expected_tag_name="v${version}-nightly";;
             *)
               echo "can't publish a release on channel ${channel}"
               exit 1;;
@@ -154,7 +156,9 @@ jobs:
 
       - uses: softprops/action-gh-release@v1
         name: Upload app bundle to release
-        if: ${{ env.RELEASE_CHANNEL }}
+        # TODO kb seems that zed.dev relies on GitHub releases for release version tracking.
+        # Find alternatives for `nightly` or just go on with more releases?
+        if: ${{ env.RELEASE_CHANNEL == 'preview' || env.RELEASE_CHANNEL == 'stable' }}
         with:
           draft: true
           prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 0d537b882a..36690bcd25 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -118,14 +118,20 @@ fn view_release_notes(_: &ViewReleaseNotes, cx: &mut AppContext) {
         let auto_updater = auto_updater.read(cx);
         let server_url = &auto_updater.server_url;
         let current_version = auto_updater.current_version;
-        let latest_release_url = if cx.has_global::<ReleaseChannel>()
-            && *cx.global::<ReleaseChannel>() == ReleaseChannel::Preview
-        {
-            format!("{server_url}/releases/preview/{current_version}")
-        } else {
-            format!("{server_url}/releases/stable/{current_version}")
-        };
-        cx.platform().open_url(&latest_release_url);
+        if cx.has_global::<ReleaseChannel>() {
+            match cx.global::<ReleaseChannel>() {
+                ReleaseChannel::Dev => {}
+                ReleaseChannel::Nightly => cx
+                    .platform()
+                    .open_url(&format!("{server_url}/releases/nightly/{current_version}")),
+                ReleaseChannel::Preview => cx
+                    .platform()
+                    .open_url(&format!("{server_url}/releases/preview/{current_version}")),
+                ReleaseChannel::Stable => cx
+                    .platform()
+                    .open_url(&format!("{server_url}/releases/stable/{current_version}")),
+            }
+        }
     }
 }
 
@@ -224,22 +230,19 @@ impl AutoUpdater {
             )
         });
 
-        let preview_param = cx.read(|cx| {
+        let mut url_string = format!(
+            "{server_url}/api/releases/latest?token={ZED_SECRET_CLIENT_TOKEN}&asset=Zed.dmg"
+        );
+        cx.read(|cx| {
             if cx.has_global::<ReleaseChannel>() {
-                if *cx.global::<ReleaseChannel>() == ReleaseChannel::Preview {
-                    return "&preview=1";
+                if let Some(param) = cx.global::<ReleaseChannel>().release_query_param() {
+                    url_string += "&";
+                    url_string += param;
                 }
             }
-            ""
         });
 
-        let mut response = client
-            .get(
-                &format!("{server_url}/api/releases/latest?token={ZED_SECRET_CLIENT_TOKEN}&asset=Zed.dmg{preview_param}"),
-                Default::default(),
-                true,
-            )
-            .await?;
+        let mut response = client.get(&url_string, Default::default(), true).await?;
 
         let mut body = Vec::new();
         response
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 9f63d0e2be..a14088cc50 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -987,9 +987,17 @@ impl Client {
         self.establish_websocket_connection(credentials, cx)
     }
 
-    async fn get_rpc_url(http: Arc<dyn HttpClient>, is_preview: bool) -> Result<Url> {
-        let preview_param = if is_preview { "?preview=1" } else { "" };
-        let url = format!("{}/rpc{preview_param}", *ZED_SERVER_URL);
+    async fn get_rpc_url(
+        http: Arc<dyn HttpClient>,
+        release_channel: Option<ReleaseChannel>,
+    ) -> Result<Url> {
+        let mut url = format!("{}/rpc", *ZED_SERVER_URL);
+        if let Some(preview_param) =
+            release_channel.and_then(|channel| channel.release_query_param())
+        {
+            url += "?";
+            url += preview_param;
+        }
         let response = http.get(&url, Default::default(), false).await?;
 
         // Normally, ZED_SERVER_URL is set to the URL of zed.dev website.
@@ -1024,11 +1032,11 @@ impl Client {
         credentials: &Credentials,
         cx: &AsyncAppContext,
     ) -> Task<Result<Connection, EstablishConnectionError>> {
-        let use_preview_server = cx.read(|cx| {
+        let release_channel = cx.read(|cx| {
             if cx.has_global::<ReleaseChannel>() {
-                *cx.global::<ReleaseChannel>() != ReleaseChannel::Stable
+                Some(*cx.global::<ReleaseChannel>())
             } else {
-                false
+                None
             }
         });
 
@@ -1041,7 +1049,7 @@ impl Client {
 
         let http = self.http.clone();
         cx.background().spawn(async move {
-            let mut rpc_url = Self::get_rpc_url(http, use_preview_server).await?;
+            let mut rpc_url = Self::get_rpc_url(http, release_channel).await?;
             let rpc_host = rpc_url
                 .host_str()
                 .zip(rpc_url.port_or_known_default())
@@ -1191,7 +1199,7 @@ impl Client {
 
         // Use the collab server's admin API to retrieve the id
         // of the impersonated user.
-        let mut url = Self::get_rpc_url(http.clone(), false).await?;
+        let mut url = Self::get_rpc_url(http.clone(), None).await?;
         url.set_path("/user");
         url.set_query(Some(&format!("github_login={login}")));
         let request = Request::get(url.as_str())
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index fd93aaeec8..ad2b29c388 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -20,7 +20,7 @@ pub struct Telemetry {
 #[derive(Default)]
 struct TelemetryState {
     metrics_id: Option<Arc<str>>,      // Per logged-in user
-    installation_id: Option<Arc<str>>, // Per app installation (different for dev, preview, and stable)
+    installation_id: Option<Arc<str>>, // Per app installation (different for dev, nightly, preview, and stable)
     session_id: Option<Arc<str>>,      // Per app launch
     app_version: Option<Arc<str>>,
     release_channel: Option<&'static str>,
diff --git a/crates/client2/src/client2.rs b/crates/client2/src/client2.rs
index 93ec7f329b..b4279b023e 100644
--- a/crates/client2/src/client2.rs
+++ b/crates/client2/src/client2.rs
@@ -923,9 +923,17 @@ impl Client {
         self.establish_websocket_connection(credentials, cx)
     }
 
-    async fn get_rpc_url(http: Arc<dyn HttpClient>, is_preview: bool) -> Result<Url> {
-        let preview_param = if is_preview { "?preview=1" } else { "" };
-        let url = format!("{}/rpc{preview_param}", *ZED_SERVER_URL);
+    async fn get_rpc_url(
+        http: Arc<dyn HttpClient>,
+        release_channel: Option<ReleaseChannel>,
+    ) -> Result<Url> {
+        let mut url = format!("{}/rpc", *ZED_SERVER_URL);
+        if let Some(preview_param) =
+            release_channel.and_then(|channel| channel.release_query_param())
+        {
+            url += "?";
+            url += preview_param;
+        }
         let response = http.get(&url, Default::default(), false).await?;
 
         // Normally, ZED_SERVER_URL is set to the URL of zed.dev website.
@@ -960,9 +968,7 @@ impl Client {
         credentials: &Credentials,
         cx: &AsyncAppContext,
     ) -> Task<Result<Connection, EstablishConnectionError>> {
-        let use_preview_server = cx
-            .try_read_global(|channel: &ReleaseChannel, _| *channel != ReleaseChannel::Stable)
-            .unwrap_or(false);
+        let release_channel = cx.try_read_global(|channel: &ReleaseChannel, _| *channel);
 
         let request = Request::builder()
             .header(
@@ -973,7 +979,7 @@ impl Client {
 
         let http = self.http.clone();
         cx.background_executor().spawn(async move {
-            let mut rpc_url = Self::get_rpc_url(http, use_preview_server).await?;
+            let mut rpc_url = Self::get_rpc_url(http, release_channel).await?;
             let rpc_host = rpc_url
                 .host_str()
                 .zip(rpc_url.port_or_known_default())
@@ -1120,7 +1126,7 @@ impl Client {
 
         // Use the collab server's admin API to retrieve the id
         // of the impersonated user.
-        let mut url = Self::get_rpc_url(http.clone(), false).await?;
+        let mut url = Self::get_rpc_url(http.clone(), None).await?;
         url.set_path("/user");
         url.set_query(Some(&format!("github_login={login}")));
         let request = Request::get(url.as_str())
diff --git a/crates/client2/src/telemetry.rs b/crates/client2/src/telemetry.rs
index 3723f7b906..cf5b3b765b 100644
--- a/crates/client2/src/telemetry.rs
+++ b/crates/client2/src/telemetry.rs
@@ -20,7 +20,7 @@ pub struct Telemetry {
 
 struct TelemetryState {
     metrics_id: Option<Arc<str>>,      // Per logged-in user
-    installation_id: Option<Arc<str>>, // Per app installation (different for dev, preview, and stable)
+    installation_id: Option<Arc<str>>, // Per app installation (different for dev, nightly, preview, and stable)
     session_id: Option<Arc<str>>,      // Per app launch
     release_channel: Option<&'static str>,
     app_metadata: AppMetadata,
diff --git a/crates/util/src/channel.rs b/crates/util/src/channel.rs
index 47c6a570a1..fa94bfe1ec 100644
--- a/crates/util/src/channel.rs
+++ b/crates/util/src/channel.rs
@@ -11,6 +11,7 @@ lazy_static! {
     };
     pub static ref RELEASE_CHANNEL: ReleaseChannel = match RELEASE_CHANNEL_NAME.as_str() {
         "dev" => ReleaseChannel::Dev,
+        "nightly" => ReleaseChannel::Nightly,
         "preview" => ReleaseChannel::Preview,
         "stable" => ReleaseChannel::Stable,
         _ => panic!("invalid release channel {}", *RELEASE_CHANNEL_NAME),
@@ -21,6 +22,7 @@ lazy_static! {
 pub enum ReleaseChannel {
     #[default]
     Dev,
+    Nightly,
     Preview,
     Stable,
 }
@@ -29,6 +31,7 @@ impl ReleaseChannel {
     pub fn display_name(&self) -> &'static str {
         match self {
             ReleaseChannel::Dev => "Zed Dev",
+            ReleaseChannel::Nightly => "Zed Nightly",
             ReleaseChannel::Preview => "Zed Preview",
             ReleaseChannel::Stable => "Zed",
         }
@@ -37,6 +40,8 @@ impl ReleaseChannel {
     pub fn dev_name(&self) -> &'static str {
         match self {
             ReleaseChannel::Dev => "dev",
+            // TODO kb need to add DB data
+            ReleaseChannel::Nightly => "nightly",
             ReleaseChannel::Preview => "preview",
             ReleaseChannel::Stable => "stable",
         }
@@ -45,6 +50,7 @@ impl ReleaseChannel {
     pub fn url_scheme(&self) -> &'static str {
         match self {
             ReleaseChannel::Dev => "zed-dev://",
+            ReleaseChannel::Nightly => "zed-nightly://",
             ReleaseChannel::Preview => "zed-preview://",
             ReleaseChannel::Stable => "zed://",
         }
@@ -53,15 +59,28 @@ impl ReleaseChannel {
     pub fn link_prefix(&self) -> &'static str {
         match self {
             ReleaseChannel::Dev => "https://zed.dev/dev/",
+            // TODO kb need to add server handling
+            ReleaseChannel::Nightly => "https://zed.dev/nightly/",
             ReleaseChannel::Preview => "https://zed.dev/preview/",
             ReleaseChannel::Stable => "https://zed.dev/",
         }
     }
+
+    pub fn release_query_param(&self) -> Option<&'static str> {
+        match self {
+            Self::Dev => None,
+            // TODO kb need to add server handling
+            Self::Nightly => Some("nightly=1"),
+            Self::Preview => Some("preview=1"),
+            Self::Stable => None,
+        }
+    }
 }
 
 pub fn parse_zed_link(link: &str) -> Option<&str> {
     for release in [
         ReleaseChannel::Dev,
+        ReleaseChannel::Nightly,
         ReleaseChannel::Preview,
         ReleaseChannel::Stable,
     ] {
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 028653696a..ab8d5b7efe 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -170,6 +170,15 @@ osx_minimum_system_version = "10.15.7"
 osx_info_plist_exts = ["resources/info/*"]
 osx_url_schemes = ["zed-dev"]
 
+[package.metadata.bundle-nightly]
+# TODO kb different icon?
+icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]
+identifier = "dev.zed.Zed-Nightly"
+name = "Zed Nightly"
+osx_minimum_system_version = "10.15.7"
+osx_info_plist_exts = ["resources/info/*"]
+osx_url_schemes = ["zed-nightly"]
+
 [package.metadata.bundle-preview]
 icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]
 identifier = "dev.zed.Zed-Preview"
@@ -178,7 +187,6 @@ osx_minimum_system_version = "10.15.7"
 osx_info_plist_exts = ["resources/info/*"]
 osx_url_schemes = ["zed-preview"]
 
-
 [package.metadata.bundle-stable]
 icon = ["resources/app-icon@2x.png", "resources/app-icon.png"]
 identifier = "dev.zed.Zed"
diff --git a/crates/zed/src/only_instance.rs b/crates/zed/src/only_instance.rs
index a8c4b30816..85dbd3684a 100644
--- a/crates/zed/src/only_instance.rs
+++ b/crates/zed/src/only_instance.rs
@@ -17,6 +17,7 @@ fn address() -> SocketAddr {
         ReleaseChannel::Dev => 43737,
         ReleaseChannel::Preview => 43738,
         ReleaseChannel::Stable => 43739,
+        ReleaseChannel::Nightly => 43740,
     };
 
     SocketAddr::V4(SocketAddrV4::new(LOCALHOST, port))
@@ -25,6 +26,7 @@ fn address() -> SocketAddr {
 fn instance_handshake() -> &'static str {
     match *util::channel::RELEASE_CHANNEL {
         ReleaseChannel::Dev => "Zed Editor Dev Instance Running",
+        ReleaseChannel::Nightly => "Zed Editor Nightly Instance Running",
         ReleaseChannel::Preview => "Zed Editor Preview Instance Running",
         ReleaseChannel::Stable => "Zed Editor Stable Instance Running",
     }
diff --git a/crates/zed2/Cargo.toml b/crates/zed2/Cargo.toml
index aacaedca88..c82f1eef5d 100644
--- a/crates/zed2/Cargo.toml
+++ b/crates/zed2/Cargo.toml
@@ -166,6 +166,15 @@ osx_minimum_system_version = "10.15.7"
 osx_info_plist_exts = ["resources/info/*"]
 osx_url_schemes = ["zed-dev"]
 
+[package.metadata.bundle-nightly]
+# TODO kb different icon?
+icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]
+identifier = "dev.zed.Zed-Nightly"
+name = "Zed Nightly"
+osx_minimum_system_version = "10.15.7"
+osx_info_plist_exts = ["resources/info/*"]
+osx_url_schemes = ["zed-nightly"]
+
 [package.metadata.bundle-preview]
 icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]
 identifier = "dev.zed.Zed-Preview"
diff --git a/crates/zed2/src/only_instance.rs b/crates/zed2/src/only_instance.rs
index a8c4b30816..85dbd3684a 100644
--- a/crates/zed2/src/only_instance.rs
+++ b/crates/zed2/src/only_instance.rs
@@ -17,6 +17,7 @@ fn address() -> SocketAddr {
         ReleaseChannel::Dev => 43737,
         ReleaseChannel::Preview => 43738,
         ReleaseChannel::Stable => 43739,
+        ReleaseChannel::Nightly => 43740,
     };
 
     SocketAddr::V4(SocketAddrV4::new(LOCALHOST, port))
@@ -25,6 +26,7 @@ fn address() -> SocketAddr {
 fn instance_handshake() -> &'static str {
     match *util::channel::RELEASE_CHANNEL {
         ReleaseChannel::Dev => "Zed Editor Dev Instance Running",
+        ReleaseChannel::Nightly => "Zed Editor Nightly Instance Running",
         ReleaseChannel::Preview => "Zed Editor Preview Instance Running",
         ReleaseChannel::Stable => "Zed Editor Stable Instance Running",
     }
diff --git a/script/bump-zed-minor-versions b/script/bump-zed-minor-versions
index 8dcf7e334e..9e03d8a70c 100755
--- a/script/bump-zed-minor-versions
+++ b/script/bump-zed-minor-versions
@@ -43,8 +43,8 @@ if [[ $patch != 0 ]]; then
   echo "patch version on main should be zero"
   exit 1
 fi
-if [[ $(cat crates/zed/RELEASE_CHANNEL) != dev ]]; then
-  echo "release channel on main should be dev"
+if [[ $(cat crates/zed/RELEASE_CHANNEL) != dev && $(cat crates/zed/RELEASE_CHANNEL) != nightly ]]; then
+  echo "release channel on main should be dev or nightly"
   exit 1
 fi
 if git show-ref --quiet refs/tags/${preview_tag_name}; then
@@ -59,6 +59,7 @@ if ! git show-ref --quiet refs/heads/${prev_minor_branch_name}; then
   echo "previous branch ${minor_branch_name} doesn't exist"
   exit 1
 fi
+# TODO kb anything else for RELEASE_CHANNEL == nightly needs to be done below?
 if [[ $(git show ${prev_minor_branch_name}:crates/zed/RELEASE_CHANNEL) != preview ]]; then
   echo "release channel on branch ${prev_minor_branch_name} should be preview"
   exit 1
diff --git a/script/bump-zed-patch-version b/script/bump-zed-patch-version
index de0c0f7d66..e00e747aa3 100755
--- a/script/bump-zed-patch-version
+++ b/script/bump-zed-patch-version
@@ -9,8 +9,11 @@ case $channel in
   preview)
     tag_suffix="-pre"
     ;;
+  nightly)
+    tag_suffix="-nightly"
+    ;;
   *)
-    echo "this must be run on a stable or preview release branch" >&2
+    echo "this must be run on either of stable|preview|nightly release branches" >&2
     exit 1
     ;;
 esac
diff --git a/script/deploy b/script/deploy
index d32d387339..fcb2db4e29 100755
--- a/script/deploy
+++ b/script/deploy
@@ -4,6 +4,7 @@ set -eu
 source script/lib/deploy-helpers.sh
 
 if [[ $# < 2 ]]; then
+  # TODO kb nightly deploy?
   echo "Usage: $0 <production|staging|preview> <tag-name>"
   exit 1
 fi
diff --git a/script/deploy-migration b/script/deploy-migration
index a6b1574c04..4ea36993fe 100755
--- a/script/deploy-migration
+++ b/script/deploy-migration
@@ -4,6 +4,7 @@ set -eu
 source script/lib/deploy-helpers.sh
 
 if [[ $# < 2 ]]; then
+  # TODO kb nightly migrations?
   echo "Usage: $0 <production|staging|preview> <tag-name>"
   exit 1
 fi
@@ -23,4 +24,4 @@ envsubst < crates/collab/k8s/migrate.template.yml | kubectl apply -f -
 pod=$(kubectl --namespace=${environment} get pods --selector=job-name=${ZED_MIGRATE_JOB_NAME} --output=jsonpath='{.items[0].metadata.name}')
 
 echo "Job pod:" $pod
-kubectl --namespace=${environment} logs -f ${pod}
\ No newline at end of file
+kubectl --namespace=${environment} logs -f ${pod}
diff --git a/script/what-is-deployed b/script/what-is-deployed
index f97e216f4a..6d18edbd31 100755
--- a/script/what-is-deployed
+++ b/script/what-is-deployed
@@ -4,6 +4,7 @@ set -eu
 source script/lib/deploy-helpers.sh
 
 if [[ $# < 1 ]]; then
+  # TODO kb infra for nightly?
   echo "Usage: $0 <production|staging|preview>"
   exit 1
 fi

From 5cf953d559cffcc9b6105e164f6c6928d49d09e7 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Fri, 17 Nov 2023 10:31:10 -0800
Subject: [PATCH 02/17] Add error messages to server deployment for nightly

---
 script/deploy           | 8 ++++++--
 script/deploy-migration | 8 ++++++--
 script/what-is-deployed | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/script/deploy b/script/deploy
index fcb2db4e29..b6da3f8f84 100755
--- a/script/deploy
+++ b/script/deploy
@@ -4,13 +4,17 @@ set -eu
 source script/lib/deploy-helpers.sh
 
 if [[ $# < 2 ]]; then
-  # TODO kb nightly deploy?
-  echo "Usage: $0 <production|staging|preview> <tag-name>"
+  echo "Usage: $0 <production|staging|preview> <tag-name> (nightly is not yet supported)"
   exit 1
 fi
 environment=$1
 version=$2
 
+if [[ ${environment} == "nightly" ]]; then
+  echo "nightly is not yet supported"
+  exit 1
+fi
+
 export_vars_for_environment ${environment}
 image_id=$(image_id_for_version ${version})
 
diff --git a/script/deploy-migration b/script/deploy-migration
index 4ea36993fe..340e6cef1f 100755
--- a/script/deploy-migration
+++ b/script/deploy-migration
@@ -4,13 +4,17 @@ set -eu
 source script/lib/deploy-helpers.sh
 
 if [[ $# < 2 ]]; then
-  # TODO kb nightly migrations?
-  echo "Usage: $0 <production|staging|preview> <tag-name>"
+  echo "Usage: $0 <production|staging|preview> <tag-name> (nightly is not yet supported)"
   exit 1
 fi
 environment=$1
 version=$2
 
+if [[ ${environment} == "nightly" ]]; then
+  echo "nightly is not yet supported"
+  exit 1
+fi
+
 export_vars_for_environment ${environment}
 image_id=$(image_id_for_version ${version})
 
diff --git a/script/what-is-deployed b/script/what-is-deployed
index 6d18edbd31..b6a68dd3b3 100755
--- a/script/what-is-deployed
+++ b/script/what-is-deployed
@@ -4,12 +4,16 @@ set -eu
 source script/lib/deploy-helpers.sh
 
 if [[ $# < 1 ]]; then
-  # TODO kb infra for nightly?
-  echo "Usage: $0 <production|staging|preview>"
+  echo "Usage: $0 <production|staging|preview> (nightly is not yet supported)"
   exit 1
 fi
 environment=$1
 
+if [[ ${environment} == "nightly" ]]; then
+  echo "nightly is not yet supported"
+  exit 1
+fi
+
 export_vars_for_environment ${environment}
 target_zed_kube_cluster
 

From 6976af502975ddb094ada8698383cf20ea7b9ab9 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Fri, 17 Nov 2023 12:16:55 -0800
Subject: [PATCH 03/17] Push some sketches

---
 .github/workflows/release_nightly.yml | 163 ++++++++++++++++++++++++++
 crates/zed/RELEASE_CHANNEL            |   2 +-
 script/upload-nightly                 |  42 +++++++
 3 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/release_nightly.yml
 create mode 100644 script/upload-nightly

diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
new file mode 100644
index 0000000000..bb743505da
--- /dev/null
+++ b/.github/workflows/release_nightly.yml
@@ -0,0 +1,163 @@
+name: Release Nightly
+
+on:
+  schedule:
+    # Fire every night at 1:00am
+    - cron: "0 1 * * *"
+  push:
+    tags:
+      - "nightly*"
+
+env:
+  CARGO_TERM_COLOR: always
+  CARGO_INCREMENTAL: 0
+  RUST_BACKTRACE: 1
+
+jobs:
+  rustfmt:
+    name: Check formatting
+    runs-on:
+      - self-hosted
+      - test
+    steps:
+      - name: Install Rust
+        run: |
+          rustup set profile minimal
+          rustup update stable
+
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          clean: false
+          submodules: "recursive"
+
+      - name: cargo fmt
+        run: cargo fmt --all -- --check
+
+  tests:
+    name: Run tests
+    runs-on:
+      - self-hosted
+      - test
+    needs: rustfmt
+    env:
+      RUSTFLAGS: -D warnings
+    steps:
+      - name: Install Rust
+        run: |
+          rustup set profile minimal
+          rustup update stable
+          rustup target add wasm32-wasi
+          cargo install cargo-nextest
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          clean: false
+          submodules: "recursive"
+
+      - name: Limit target directory size
+        run: script/clear-target-dir-if-larger-than 70
+
+      - name: Run check
+        run: cargo check --workspace
+
+      - name: Run tests
+        run: cargo nextest run --workspace --no-fail-fast
+
+      - name: Build collab
+        run: cargo build -p collab
+
+      - name: Build other binaries
+        run: cargo build --workspace --bins --all-features
+
+  bundle:
+    name: Bundle app
+    runs-on:
+      - self-hosted
+      - bundle
+    needs: tests
+    env:
+      MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
+      MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
+      APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
+      APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+    steps:
+      - name: Install Rust
+        run: |
+          rustup set profile minimal
+          rustup update stable
+          rustup target add aarch64-apple-darwin
+          rustup target add x86_64-apple-darwin
+          rustup target add wasm32-wasi
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          clean: false
+          submodules: "recursive"
+
+      - name: Limit target directory size
+        run: script/clear-target-dir-if-larger-than 70
+
+      - name: Determine version and release channel
+        run: |
+          set -eu
+
+          version=$(git rev-parse --short HEAD)
+          channel=$(cat crates/zed/RELEASE_CHANNEL)
+          echo "Publishing version: ${version} on release channel ${channel}"
+          echo "RELEASE_CHANNEL=${channel}" >> $GITHUB_ENV
+
+          case ${channel} in
+            nightly)
+              exit 0;;
+            *)
+              echo "can't publish a release on channel ${channel} with this action"
+              exit 1;;
+          esac
+
+      - name: Generate license file
+        run: script/generate-licenses
+
+      - name: Create app bundle
+        run: script/bundle
+
+      # So, here's an example of how this _could_ be done.
+      # Problem: Need to setup some docker secrets
+      # Problem: This action is very old
+      # Problem: Need to add stuff for interacting with our API
+      # - uses: BetaHuhn/do-spaces-action@v2
+      #   name: Upload app bundle to nightly
+      #   id: spaces-upload
+      #   with:
+      #     # Need to put this stuff in kuberenetes I think
+      #     access_key: ${{ secrets.ACCESS_KEY}}
+      #     secret_key: ${{ secrets.SECRET_KEY }}
+      #     space_name: ${{ secrets.SPACE_NAME }}
+      #     space_region: ${{ secrets.SPACE_REGION }}
+      #     source: target/release/Zed.dmg
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload Zed Nightly
+        run: script/upload-nightly #something something
+        with:
+          do_secret: ${{ secrets.DO_SPACES_SECRET }}
+          do_access_key: ${{ secrets.DO_SPACES_ACCESS_KEY }}
+
+      # Upload to zed.dev?
+      - name: Upload new release URL to zed.dev
+        run: ??? #something something
+        with:
+          nightly_release_key: ${{ secrets.NIGHTLY_RELEASE_KEY }}
+          deployment_url: ${{ steps.spaces-upload.outputs.output_url }}
diff --git a/crates/zed/RELEASE_CHANNEL b/crates/zed/RELEASE_CHANNEL
index 90012116c0..bf867e0ae5 100644
--- a/crates/zed/RELEASE_CHANNEL
+++ b/crates/zed/RELEASE_CHANNEL
@@ -1 +1 @@
-dev
\ No newline at end of file
+nightly
diff --git a/script/upload-nightly b/script/upload-nightly
new file mode 100644
index 0000000000..e98516a7dc
--- /dev/null
+++ b/script/upload-nightly
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Based on the template in: https://docs.digitalocean.com/reference/api/spaces-api/
+
+
+# Step 1: Define the parameters for the Space you want to upload to.
+SPACE="zed-nightly-host" # Find your endpoint in the control panel, under Settings.
+REGION="nyc3" # Must be "us-east-1" when creating new Spaces. Otherwise, use the region in your endpoint (e.g. nyc3).
+STORAGETYPE="STANDARD" # Storage type, can be STANDARD, REDUCED_REDUNDANCY, etc.
+KEY="???????" # Access key pair. You can create access key pairs using the control panel or API.
+SECRET="$SECRET" # Secret access key defined through an environment variable.
+
+# Step 2: Define a function that uploads your object via cURL.
+function putS3
+{
+  path="." # The local path to the file you want to upload.
+  file="hello-world.txt" # The file you want to upload.
+  space_path="/" # The path within your Space where you want to upload the new file.
+  space="${SPACE}"
+  date=$(date +"%a, %d %b %Y %T %z")
+  acl="x-amz-acl:private" # Defines Access-control List (ACL) permissions, such as private or public.
+  content_type="text/plain" # Defines the type of content you are uploading.
+  storage_type="x-amz-storage-class:${STORAGETYPE}"
+  string="PUT\n\n$content_type\n$date\n$acl\n$storage_type\n/$space$space_path$file"
+  signature=$(echo -en "${string}" | openssl sha1 -hmac "${SECRET}" -binary | base64)
+  curl -s -X PUT -T "$path/$file" \ # The cURL command that uploads your file.
+    -H "Host: $space.${REGION}.digitaloceanspaces.com" \
+    -H "Date: $date" \
+    -H "Content-Type: $content_type" \
+    -H "$storage_type" \
+    -H "$acl" \
+    -H "Authorization: AWS ${KEY}:$signature" \
+    "https://$space.${REGION}.digitaloceanspaces.com$space_path$file"
+}
+
+# Step 3: mkdir for file based on release sha
+# Step 4: Put Zed.dmg in that directory
+for file in "$path"/*; do
+  putS3 "$path" "${file##*/}" "nyc-tutorial-space/"
+done
+
+# Step 5: Output that directory for next step

From f44f60c6e6b4b8f9f9f9ee9d9072e4aebc9f8424 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Fri, 17 Nov 2023 12:54:16 -0800
Subject: [PATCH 04/17] WIP:

---
 crates/auto_update/src/auto_update.rs | 4 +---
 script/upload-nightly                 | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 36690bcd25..cf285ac7cf 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -121,9 +121,7 @@ fn view_release_notes(_: &ViewReleaseNotes, cx: &mut AppContext) {
         if cx.has_global::<ReleaseChannel>() {
             match cx.global::<ReleaseChannel>() {
                 ReleaseChannel::Dev => {}
-                ReleaseChannel::Nightly => cx
-                    .platform()
-                    .open_url(&format!("{server_url}/releases/nightly/{current_version}")),
+                ReleaseChannel::Nightly => {}
                 ReleaseChannel::Preview => cx
                     .platform()
                     .open_url(&format!("{server_url}/releases/preview/{current_version}")),
diff --git a/script/upload-nightly b/script/upload-nightly
index e98516a7dc..56d00dca52 100644
--- a/script/upload-nightly
+++ b/script/upload-nightly
@@ -34,6 +34,8 @@ function putS3
 }
 
 # Step 3: mkdir for file based on release sha
+# :/sha-of- -commit/Zed.dmg
+
 # Step 4: Put Zed.dmg in that directory
 for file in "$path"/*; do
   putS3 "$path" "${file##*/}" "nyc-tutorial-space/"

From c684f08e308b3298007c6be7bd40d32b674a472e Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 17 Nov 2023 14:07:51 -0800
Subject: [PATCH 05/17] Wire up release_nightly workflow, to upload artifacts
 to DO spaces

Co-authored-by: Kirill <kirill@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
---
 .github/actions/run_tests/action.yml  | 48 ++++++++++++++
 .github/actions/rust_fmt/action.yml   | 21 ++++++
 .github/workflows/ci.yml              | 49 +-------------
 .github/workflows/release_nightly.yml | 95 +++------------------------
 script/upload-nightly                 | 45 ++++++-------
 5 files changed, 100 insertions(+), 158 deletions(-)
 create mode 100644 .github/actions/run_tests/action.yml
 create mode 100644 .github/actions/rust_fmt/action.yml
 mode change 100644 => 100755 script/upload-nightly

diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
new file mode 100644
index 0000000000..abb4e5f18b
--- /dev/null
+++ b/.github/actions/run_tests/action.yml
@@ -0,0 +1,48 @@
+name: 'Run tests'
+description: 'Runs the tests'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install Rust
+      shell: bash -euxo pipefail {0}
+      run: |
+        rustup set profile minimal
+        rustup update stable
+        rustup target add wasm32-wasi
+        cargo install cargo-nextest
+
+    - name: Install Node
+      uses: actions/setup-node@v3
+      with:
+        node-version: "18"
+
+    - name: Checkout repo
+      uses: actions/checkout@v3
+      with:
+        clean: false
+        submodules: "recursive"
+
+    - name: Limit target directory size
+      shell: bash -euxo pipefail {0}
+      run: script/clear-target-dir-if-larger-than 70
+
+    - name: Run check
+      env:
+        RUSTFLAGS: -D warnings
+      shell: bash -euxo pipefail {0}
+      run: cargo check --test --workspace
+
+    - name: Run tests
+      env:
+        RUSTFLAGS: -D warnings
+      shell: bash -euxo pipefail {0}
+      run: cargo nextest run --workspace --no-fail-fast
+
+    - name: Build collab
+      shell: bash -euxo pipefail {0}
+      run: cargo build -p collab
+
+    - name: Build other binaries
+      shell: bash -euxo pipefail {0}
+      run: cargo build --workspace --bins --all-features
diff --git a/.github/actions/rust_fmt/action.yml b/.github/actions/rust_fmt/action.yml
new file mode 100644
index 0000000000..c5d4ef3f0f
--- /dev/null
+++ b/.github/actions/rust_fmt/action.yml
@@ -0,0 +1,21 @@
+name: 'Run rustfmt'
+description: 'Runs rustfmt'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install Rust
+      shell: bash -euxo pipefail {0}
+      run: |
+        rustup set profile minimal
+        rustup update stable
+
+    - name: Checkout repo
+      uses: actions/checkout@v3
+      with:
+        clean: false
+        submodules: "recursive"
+
+    - name: cargo fmt
+      shell: bash -euxo pipefail {0}
+      run: cargo fmt --all -- --check
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 39b49da8ed..7c90810ad0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,19 +23,8 @@ jobs:
       - self-hosted
       - test
     steps:
-      - name: Install Rust
-        run: |
-          rustup set profile minimal
-          rustup update stable
-
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          clean: false
-          submodules: "recursive"
-
-      - name: cargo fmt
-        run: cargo fmt --all -- --check
+      - name: Run rustfmt
+        uses: ./.github/actions/rust_fmt
 
   tests:
     name: Run tests
@@ -43,41 +32,9 @@ jobs:
       - self-hosted
       - test
     needs: rustfmt
-    env:
-      RUSTFLAGS: -D warnings
     steps:
-      - name: Install Rust
-        run: |
-          rustup set profile minimal
-          rustup update stable
-          rustup target add wasm32-wasi
-          cargo install cargo-nextest
-
-      - name: Install Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: "18"
-
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          clean: false
-          submodules: "recursive"
-
-      - name: Limit target directory size
-        run: script/clear-target-dir-if-larger-than 70
-
-      - name: Run check
-        run: cargo check --workspace
-
       - name: Run tests
-        run: cargo nextest run --workspace --no-fail-fast
-
-      - name: Build collab
-        run: cargo build -p collab
-
-      - name: Build other binaries
-        run: cargo build --workspace --bins --all-features
+        uses: ./.github/actions/run_tests
 
   bundle:
     name: Bundle app
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index bb743505da..f4ecf4669e 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -20,19 +20,8 @@ jobs:
       - self-hosted
       - test
     steps:
-      - name: Install Rust
-        run: |
-          rustup set profile minimal
-          rustup update stable
-
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          clean: false
-          submodules: "recursive"
-
-      - name: cargo fmt
-        run: cargo fmt --all -- --check
+      - name: Run rustfmt
+        uses: ./.github/actions/rust_fmt
 
   tests:
     name: Run tests
@@ -40,41 +29,9 @@ jobs:
       - self-hosted
       - test
     needs: rustfmt
-    env:
-      RUSTFLAGS: -D warnings
     steps:
-      - name: Install Rust
-        run: |
-          rustup set profile minimal
-          rustup update stable
-          rustup target add wasm32-wasi
-          cargo install cargo-nextest
-
-      - name: Install Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: "18"
-
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          clean: false
-          submodules: "recursive"
-
-      - name: Limit target directory size
-        run: script/clear-target-dir-if-larger-than 70
-
-      - name: Run check
-        run: cargo check --workspace
-
       - name: Run tests
-        run: cargo nextest run --workspace --no-fail-fast
-
-      - name: Build collab
-        run: cargo build -p collab
-
-      - name: Build other binaries
-        run: cargo build --workspace --bins --all-features
+        uses: ./.github/actions/run_tests
 
   bundle:
     name: Bundle app
@@ -87,6 +44,8 @@ jobs:
       MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
       APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
       APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
+      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
     steps:
       - name: Install Rust
         run: |
@@ -110,22 +69,12 @@ jobs:
       - name: Limit target directory size
         run: script/clear-target-dir-if-larger-than 70
 
-      - name: Determine version and release channel
+      - name: Set release channel to nightly
         run: |
           set -eu
-
           version=$(git rev-parse --short HEAD)
-          channel=$(cat crates/zed/RELEASE_CHANNEL)
-          echo "Publishing version: ${version} on release channel ${channel}"
-          echo "RELEASE_CHANNEL=${channel}" >> $GITHUB_ENV
-
-          case ${channel} in
-            nightly)
-              exit 0;;
-            *)
-              echo "can't publish a release on channel ${channel} with this action"
-              exit 1;;
-          esac
+          echo "Publishing version: ${version} on release channel nightly"
+          echo "nightly" > crates/zed/RELEASE_CHANNEL
 
       - name: Generate license file
         run: script/generate-licenses
@@ -133,31 +82,5 @@ jobs:
       - name: Create app bundle
         run: script/bundle
 
-      # So, here's an example of how this _could_ be done.
-      # Problem: Need to setup some docker secrets
-      # Problem: This action is very old
-      # Problem: Need to add stuff for interacting with our API
-      # - uses: BetaHuhn/do-spaces-action@v2
-      #   name: Upload app bundle to nightly
-      #   id: spaces-upload
-      #   with:
-      #     # Need to put this stuff in kuberenetes I think
-      #     access_key: ${{ secrets.ACCESS_KEY}}
-      #     secret_key: ${{ secrets.SECRET_KEY }}
-      #     space_name: ${{ secrets.SPACE_NAME }}
-      #     space_region: ${{ secrets.SPACE_REGION }}
-      #     source: target/release/Zed.dmg
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload Zed Nightly
-        run: script/upload-nightly #something something
-        with:
-          do_secret: ${{ secrets.DO_SPACES_SECRET }}
-          do_access_key: ${{ secrets.DO_SPACES_ACCESS_KEY }}
-
-      # Upload to zed.dev?
-      - name: Upload new release URL to zed.dev
-        run: ??? #something something
-        with:
-          nightly_release_key: ${{ secrets.NIGHTLY_RELEASE_KEY }}
-          deployment_url: ${{ steps.spaces-upload.outputs.output_url }}
+        run: script/upload-nightly
diff --git a/script/upload-nightly b/script/upload-nightly
old mode 100644
new mode 100755
index 56d00dca52..073976a335
--- a/script/upload-nightly
+++ b/script/upload-nightly
@@ -1,44 +1,37 @@
 #!/bin/bash
 
 # Based on the template in: https://docs.digitalocean.com/reference/api/spaces-api/
-
+set -ux
 
 # Step 1: Define the parameters for the Space you want to upload to.
 SPACE="zed-nightly-host" # Find your endpoint in the control panel, under Settings.
 REGION="nyc3" # Must be "us-east-1" when creating new Spaces. Otherwise, use the region in your endpoint (e.g. nyc3).
-STORAGETYPE="STANDARD" # Storage type, can be STANDARD, REDUCED_REDUNDANCY, etc.
-KEY="???????" # Access key pair. You can create access key pairs using the control panel or API.
-SECRET="$SECRET" # Secret access key defined through an environment variable.
 
 # Step 2: Define a function that uploads your object via cURL.
-function putS3
+function uploadToSpaces
 {
-  path="." # The local path to the file you want to upload.
-  file="hello-world.txt" # The file you want to upload.
-  space_path="/" # The path within your Space where you want to upload the new file.
-  space="${SPACE}"
+  file_to_upload="$1"
+  file_name="$2"
+  space_path="nightly"
   date=$(date +"%a, %d %b %Y %T %z")
-  acl="x-amz-acl:private" # Defines Access-control List (ACL) permissions, such as private or public.
-  content_type="text/plain" # Defines the type of content you are uploading.
-  storage_type="x-amz-storage-class:${STORAGETYPE}"
-  string="PUT\n\n$content_type\n$date\n$acl\n$storage_type\n/$space$space_path$file"
-  signature=$(echo -en "${string}" | openssl sha1 -hmac "${SECRET}" -binary | base64)
-  curl -s -X PUT -T "$path/$file" \ # The cURL command that uploads your file.
-    -H "Host: $space.${REGION}.digitaloceanspaces.com" \
+  acl="x-amz-acl:private"
+  content_type="application/octet-stream"
+  storage_type="x-amz-storage-class:STANDARD"
+  string="PUT\n\n${content_type}\n${date}\n${acl}\n${storage_type}\n/${SPACE}/${space_path}/${file_name}"
+  signature=$(echo -en "${string}" | openssl sha1 -hmac "${DIGITALOCEAN_SPACES_SECRET_KEY}" -binary | base64)
+
+  curl -vv -s -X PUT -T "$file_to_upload" \
+    -H "Host: ${SPACE}.${REGION}.digitaloceanspaces.com" \
     -H "Date: $date" \
     -H "Content-Type: $content_type" \
     -H "$storage_type" \
     -H "$acl" \
-    -H "Authorization: AWS ${KEY}:$signature" \
-    "https://$space.${REGION}.digitaloceanspaces.com$space_path$file"
+    -H "Authorization: AWS ${DIGITALOCEAN_SPACES_ACCESS_KEY}:$signature" \
+    "https://${SPACE}.${REGION}.digitaloceanspaces.com/${space_path}/${file_name}"
 }
 
-# Step 3: mkdir for file based on release sha
-# :/sha-of- -commit/Zed.dmg
+sha=$(git rev-parse HEAD)
+echo ${sha} > target/latest-sha
 
-# Step 4: Put Zed.dmg in that directory
-for file in "$path"/*; do
-  putS3 "$path" "${file##*/}" "nyc-tutorial-space/"
-done
-
-# Step 5: Output that directory for next step
+uploadToSpaces "target/release/Zed.dmg" "Zed.dmg"
+uploadToSpaces "target/latest-sha" "latest-sha"

From 5e2eb436ff27d07b4d023cddc4f4280946d39488 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 17 Nov 2023 14:13:59 -0800
Subject: [PATCH 06/17] Check out repo outside of reusable actions

Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Kirill <kirill@zed.dev>
---
 .../{rust_fmt => check_formatting}/action.yml      | 10 ++--------
 .github/actions/run_tests/action.yml               |  6 ------
 .github/workflows/ci.yml                           | 14 +++++++++++++-
 .github/workflows/release_nightly.yml              | 14 +++++++++++++-
 4 files changed, 28 insertions(+), 16 deletions(-)
 rename .github/actions/{rust_fmt => check_formatting}/action.yml (61%)

diff --git a/.github/actions/rust_fmt/action.yml b/.github/actions/check_formatting/action.yml
similarity index 61%
rename from .github/actions/rust_fmt/action.yml
rename to .github/actions/check_formatting/action.yml
index c5d4ef3f0f..7fef26407b 100644
--- a/.github/actions/rust_fmt/action.yml
+++ b/.github/actions/check_formatting/action.yml
@@ -1,5 +1,5 @@
-name: 'Run rustfmt'
-description: 'Runs rustfmt'
+name: 'Check formatting'
+description: 'Checks code formatting use cargo fmt'
 
 runs:
   using: "composite"
@@ -10,12 +10,6 @@ runs:
         rustup set profile minimal
         rustup update stable
 
-    - name: Checkout repo
-      uses: actions/checkout@v3
-      with:
-        clean: false
-        submodules: "recursive"
-
     - name: cargo fmt
       shell: bash -euxo pipefail {0}
       run: cargo fmt --all -- --check
diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
index abb4e5f18b..6d2a2c9f37 100644
--- a/.github/actions/run_tests/action.yml
+++ b/.github/actions/run_tests/action.yml
@@ -17,12 +17,6 @@ runs:
       with:
         node-version: "18"
 
-    - name: Checkout repo
-      uses: actions/checkout@v3
-      with:
-        clean: false
-        submodules: "recursive"
-
     - name: Limit target directory size
       shell: bash -euxo pipefail {0}
       run: script/clear-target-dir-if-larger-than 70
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c90810ad0..037ac228a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,8 +23,14 @@ jobs:
       - self-hosted
       - test
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          clean: false
+          submodules: "recursive"
+
       - name: Run rustfmt
-        uses: ./.github/actions/rust_fmt
+        uses: ./.github/actions/check_formatting
 
   tests:
     name: Run tests
@@ -33,6 +39,12 @@ jobs:
       - test
     needs: rustfmt
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          clean: false
+          submodules: "recursive"
+
       - name: Run tests
         uses: ./.github/actions/run_tests
 
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index f4ecf4669e..fc59137d93 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -20,8 +20,14 @@ jobs:
       - self-hosted
       - test
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          clean: false
+          submodules: "recursive"
+
       - name: Run rustfmt
-        uses: ./.github/actions/rust_fmt
+        uses: ./.github/actions/check_formatting
 
   tests:
     name: Run tests
@@ -30,6 +36,12 @@ jobs:
       - test
     needs: rustfmt
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          clean: false
+          submodules: "recursive"
+
       - name: Run tests
         uses: ./.github/actions/run_tests
 

From 6a22ab83cfbf9e6f446cb2c002e8edaedccb8310 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 17 Nov 2023 14:16:12 -0800
Subject: [PATCH 07/17] Fix cargo check --tests invocation

---
 .github/actions/run_tests/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
index 6d2a2c9f37..cfb890a45a 100644
--- a/.github/actions/run_tests/action.yml
+++ b/.github/actions/run_tests/action.yml
@@ -25,7 +25,7 @@ runs:
       env:
         RUSTFLAGS: -D warnings
       shell: bash -euxo pipefail {0}
-      run: cargo check --test --workspace
+      run: cargo check --tests --workspace
 
     - name: Run tests
       env:

From a8bea41ad822b6c225a8126c17d627c39d434bc1 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 17 Nov 2023 14:31:49 -0800
Subject: [PATCH 08/17] Put release channel back to dev

---
 crates/util/src/channel.rs | 2 +-
 crates/zed/RELEASE_CHANNEL | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/util/src/channel.rs b/crates/util/src/channel.rs
index fa94bfe1ec..7e60b5e15f 100644
--- a/crates/util/src/channel.rs
+++ b/crates/util/src/channel.rs
@@ -9,7 +9,7 @@ lazy_static! {
     } else {
         include_str!("../../zed/RELEASE_CHANNEL").to_string()
     };
-    pub static ref RELEASE_CHANNEL: ReleaseChannel = match RELEASE_CHANNEL_NAME.as_str() {
+    pub static ref RELEASE_CHANNEL: ReleaseChannel = match RELEASE_CHANNEL_NAME.as_str().trim() {
         "dev" => ReleaseChannel::Dev,
         "nightly" => ReleaseChannel::Nightly,
         "preview" => ReleaseChannel::Preview,
diff --git a/crates/zed/RELEASE_CHANNEL b/crates/zed/RELEASE_CHANNEL
index bf867e0ae5..90012116c0 100644
--- a/crates/zed/RELEASE_CHANNEL
+++ b/crates/zed/RELEASE_CHANNEL
@@ -1 +1 @@
-nightly
+dev
\ No newline at end of file

From a03d062120c9ada5d3deb0217f100686fd304117 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 17 Nov 2023 14:52:43 -0800
Subject: [PATCH 09/17] Make the commit sha availabe in the app, via a global

Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Kirill <kirill@zed.dev>
---
 crates/util/src/channel.rs |  7 +++----
 crates/zed2/build.rs       | 12 ++++++++++++
 crates/zed2/src/main.rs    |  6 +++++-
 crates/zed2/src/zed2.rs    | 11 +++++++++--
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/crates/util/src/channel.rs b/crates/util/src/channel.rs
index 7e60b5e15f..55f13df084 100644
--- a/crates/util/src/channel.rs
+++ b/crates/util/src/channel.rs
@@ -1,6 +1,5 @@
-use std::env;
-
 use lazy_static::lazy_static;
+use std::env;
 
 lazy_static! {
     pub static ref RELEASE_CHANNEL_NAME: String = if cfg!(debug_assertions) {
@@ -18,6 +17,8 @@ lazy_static! {
     };
 }
 
+pub struct AppCommitSha(pub String);
+
 #[derive(Copy, Clone, PartialEq, Eq, Default)]
 pub enum ReleaseChannel {
     #[default]
@@ -40,7 +41,6 @@ impl ReleaseChannel {
     pub fn dev_name(&self) -> &'static str {
         match self {
             ReleaseChannel::Dev => "dev",
-            // TODO kb need to add DB data
             ReleaseChannel::Nightly => "nightly",
             ReleaseChannel::Preview => "preview",
             ReleaseChannel::Stable => "stable",
@@ -69,7 +69,6 @@ impl ReleaseChannel {
     pub fn release_query_param(&self) -> Option<&'static str> {
         match self {
             Self::Dev => None,
-            // TODO kb need to add server handling
             Self::Nightly => Some("nightly=1"),
             Self::Preview => Some("preview=1"),
             Self::Stable => None,
diff --git a/crates/zed2/build.rs b/crates/zed2/build.rs
index 14bf9999fb..619f248029 100644
--- a/crates/zed2/build.rs
+++ b/crates/zed2/build.rs
@@ -1,3 +1,5 @@
+use std::process::Command;
+
 fn main() {
     println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.15.7");
 
@@ -21,4 +23,14 @@ fn main() {
 
     // Register exported Objective-C selectors, protocols, etc
     println!("cargo:rustc-link-arg=-Wl,-ObjC");
+
+    // Populate git sha environment variable if git is available
+    if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output() {
+        if output.status.success() {
+            println!(
+                "cargo:rustc-env=ZED_COMMIT_SHA={}",
+                String::from_utf8_lossy(&output.stdout).trim()
+            );
+        }
+    }
 }
diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs
index 700660a9b7..5206514dfe 100644
--- a/crates/zed2/src/main.rs
+++ b/crates/zed2/src/main.rs
@@ -43,7 +43,7 @@ use std::{
 use theme::ActiveTheme;
 use util::{
     async_maybe,
-    channel::{parse_zed_link, ReleaseChannel, RELEASE_CHANNEL},
+    channel::{parse_zed_link, AppCommitSha, ReleaseChannel, RELEASE_CHANNEL},
     http::{self, HttpClient},
     paths, ResultExt,
 };
@@ -113,6 +113,10 @@ fn main() {
 
     app.run(move |cx| {
         cx.set_global(*RELEASE_CHANNEL);
+        if let Some(build_sha) = option_env!("ZED_COMMIT_SHA") {
+            cx.set_global(AppCommitSha(build_sha.into()))
+        }
+
         cx.set_global(listener.clone());
 
         load_embedded_fonts(cx);
diff --git a/crates/zed2/src/zed2.rs b/crates/zed2/src/zed2.rs
index 84cacccb5a..e2e113c9b0 100644
--- a/crates/zed2/src/zed2.rs
+++ b/crates/zed2/src/zed2.rs
@@ -23,7 +23,7 @@ use std::{borrow::Cow, ops::Deref, sync::Arc};
 use terminal_view::terminal_panel::TerminalPanel;
 use util::{
     asset_str,
-    channel::ReleaseChannel,
+    channel::{AppCommitSha, ReleaseChannel},
     paths::{self, LOCAL_SETTINGS_RELATIVE_PATH},
     ResultExt,
 };
@@ -432,9 +432,16 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
 }
 
 fn about(_: &mut Workspace, _: &About, cx: &mut gpui::ViewContext<Workspace>) {
+    use std::fmt::Write as _;
+
     let app_name = cx.global::<ReleaseChannel>().display_name();
     let version = env!("CARGO_PKG_VERSION");
-    let prompt = cx.prompt(PromptLevel::Info, &format!("{app_name} {version}"), &["OK"]);
+    let mut message = format!("{app_name} {version}");
+    if let Some(sha) = cx.try_global::<AppCommitSha>() {
+        write!(&mut message, "\n\n{}", sha.0).unwrap();
+    }
+
+    let prompt = cx.prompt(PromptLevel::Info, &message, &["OK"]);
     cx.foreground_executor()
         .spawn(async {
             prompt.await.ok();

From dd283b471a0e35b1ab6c1a6264eab92951cbab16 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Fri, 17 Nov 2023 15:48:32 -0800
Subject: [PATCH 10/17] Add autoupdate2

co-authoredby: max@zed.dev
---
 Cargo.lock                                    |  25 ++
 Cargo.toml                                    |   1 +
 crates/auto_update2/Cargo.toml                |  29 ++
 crates/auto_update2/src/auto_update.rs        | 388 ++++++++++++++++++
 .../auto_update2/src/update_notification.rs   |  87 ++++
 crates/gpui2/src/app.rs                       |   4 +
 crates/workspace2/src/notifications.rs        |   5 +-
 crates/zed2/Cargo.toml                        |   2 +-
 crates/zed2/src/main.rs                       |   2 +-
 crates/zed2/src/zed2.rs                       |   2 +-
 10 files changed, 540 insertions(+), 5 deletions(-)
 create mode 100644 crates/auto_update2/Cargo.toml
 create mode 100644 crates/auto_update2/src/auto_update.rs
 create mode 100644 crates/auto_update2/src/update_notification.rs

diff --git a/Cargo.lock b/Cargo.lock
index 1747eae2d2..43e4ea6082 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -724,6 +724,30 @@ dependencies = [
  "workspace",
 ]
 
+[[package]]
+name = "auto_update2"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "client2",
+ "db2",
+ "gpui2",
+ "isahc",
+ "lazy_static",
+ "log",
+ "menu2",
+ "project2",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "settings2",
+ "smol",
+ "tempdir",
+ "theme2",
+ "util",
+ "workspace2",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -11543,6 +11567,7 @@ dependencies = [
  "async-recursion 0.3.2",
  "async-tar",
  "async-trait",
+ "auto_update2",
  "backtrace",
  "call2",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index f107dc5390..f495f47505 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,6 +6,7 @@ members = [
     "crates/audio",
     "crates/audio2",
     "crates/auto_update",
+    "crates/auto_update2",
     "crates/breadcrumbs",
     "crates/call",
     "crates/call2",
diff --git a/crates/auto_update2/Cargo.toml b/crates/auto_update2/Cargo.toml
new file mode 100644
index 0000000000..20eb129746
--- /dev/null
+++ b/crates/auto_update2/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "auto_update2"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[lib]
+path = "src/auto_update.rs"
+doctest = false
+
+[dependencies]
+db = { package = "db2", path = "../db2" }
+client = { package = "client2", path = "../client2" }
+gpui = { package = "gpui2", path = "../gpui2" }
+menu = { package = "menu2", path = "../menu2" }
+project = { package = "project2", path = "../project2" }
+settings = { package = "settings2", path = "../settings2" }
+theme = { package = "theme2", path = "../theme2" }
+workspace = { package = "workspace2", path = "../workspace2" }
+util = { path = "../util" }
+anyhow.workspace = true
+isahc.workspace = true
+lazy_static.workspace = true
+log.workspace = true
+serde.workspace = true
+serde_derive.workspace = true
+serde_json.workspace = true
+smol.workspace = true
+tempdir.workspace = true
diff --git a/crates/auto_update2/src/auto_update.rs b/crates/auto_update2/src/auto_update.rs
new file mode 100644
index 0000000000..273d877967
--- /dev/null
+++ b/crates/auto_update2/src/auto_update.rs
@@ -0,0 +1,388 @@
+mod update_notification;
+
+use anyhow::{anyhow, Context, Result};
+use client::{Client, TelemetrySettings, ZED_APP_PATH, ZED_APP_VERSION, ZED_SECRET_CLIENT_TOKEN};
+use db::kvp::KEY_VALUE_STORE;
+use db::RELEASE_CHANNEL;
+use gpui::{
+    actions, AppContext, AsyncAppContext, Context as _, Model, ModelContext, SemanticVersion, Task,
+    ViewContext, VisualContext,
+};
+use isahc::AsyncBody;
+use serde::Deserialize;
+use serde_derive::Serialize;
+use smol::io::AsyncReadExt;
+
+use settings::{Settings, SettingsStore};
+use smol::{fs::File, process::Command};
+use std::{ffi::OsString, sync::Arc, time::Duration};
+use update_notification::UpdateNotification;
+use util::channel::{AppCommitSha, ReleaseChannel};
+use util::http::HttpClient;
+use workspace::Workspace;
+
+const SHOULD_SHOW_UPDATE_NOTIFICATION_KEY: &str = "auto-updater-should-show-updated-notification";
+const POLL_INTERVAL: Duration = Duration::from_secs(60 * 60);
+
+actions!(Check, DismissErrorMessage, ViewReleaseNotes);
+
+#[derive(Serialize)]
+struct UpdateRequestBody {
+    installation_id: Option<Arc<str>>,
+    release_channel: Option<&'static str>,
+    telemetry: bool,
+}
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub enum AutoUpdateStatus {
+    Idle,
+    Checking,
+    Downloading,
+    Installing,
+    Updated,
+    Errored,
+}
+
+pub struct AutoUpdater {
+    status: AutoUpdateStatus,
+    current_version: SemanticVersion,
+    http_client: Arc<dyn HttpClient>,
+    pending_poll: Option<Task<Option<()>>>,
+    server_url: String,
+}
+
+#[derive(Deserialize)]
+struct JsonRelease {
+    version: String,
+    url: String,
+}
+
+struct AutoUpdateSetting(bool);
+
+impl Settings for AutoUpdateSetting {
+    const KEY: Option<&'static str> = Some("auto_update");
+
+    type FileContent = Option<bool>;
+
+    fn load(
+        default_value: &Option<bool>,
+        user_values: &[&Option<bool>],
+        _: &mut AppContext,
+    ) -> Result<Self> {
+        Ok(Self(
+            Self::json_merge(default_value, user_values)?.ok_or_else(Self::missing_default)?,
+        ))
+    }
+}
+
+pub fn init(http_client: Arc<dyn HttpClient>, server_url: String, cx: &mut AppContext) {
+    AutoUpdateSetting::register(cx);
+
+    if let Some(version) = *ZED_APP_VERSION {
+        let auto_updater = cx.build_model(|cx| {
+            let updater = AutoUpdater::new(version, http_client, server_url);
+
+            let mut update_subscription = AutoUpdateSetting::get_global(cx)
+                .0
+                .then(|| updater.start_polling(cx));
+
+            cx.observe_global::<SettingsStore>(move |updater, cx| {
+                if AutoUpdateSetting::get_global(cx).0 {
+                    if update_subscription.is_none() {
+                        update_subscription = Some(updater.start_polling(cx))
+                    }
+                } else {
+                    update_subscription.take();
+                }
+            })
+            .detach();
+
+            updater
+        });
+        cx.set_global(Some(auto_updater));
+        //todo!(action)
+        // cx.add_global_action(check);
+        // cx.add_global_action(view_release_notes);
+        // cx.add_action(UpdateNotification::dismiss);
+    }
+}
+
+pub fn check(_: &Check, cx: &mut AppContext) {
+    if let Some(updater) = AutoUpdater::get(cx) {
+        updater.update(cx, |updater, cx| updater.poll(cx));
+    }
+}
+
+fn _view_release_notes(_: &ViewReleaseNotes, cx: &mut AppContext) {
+    if let Some(auto_updater) = AutoUpdater::get(cx) {
+        let auto_updater = auto_updater.read(cx);
+        let server_url = &auto_updater.server_url;
+        let current_version = auto_updater.current_version;
+        if cx.has_global::<ReleaseChannel>() {
+            match cx.global::<ReleaseChannel>() {
+                ReleaseChannel::Dev => {}
+                ReleaseChannel::Nightly => {}
+                ReleaseChannel::Preview => {
+                    cx.open_url(&format!("{server_url}/releases/preview/{current_version}"))
+                }
+                ReleaseChannel::Stable => {
+                    cx.open_url(&format!("{server_url}/releases/stable/{current_version}"))
+                }
+            }
+        }
+    }
+}
+
+pub fn notify_of_any_new_update(cx: &mut ViewContext<Workspace>) -> Option<()> {
+    let updater = AutoUpdater::get(cx)?;
+    let version = updater.read(cx).current_version;
+    let should_show_notification = updater.read(cx).should_show_update_notification(cx);
+
+    cx.spawn(|workspace, mut cx| async move {
+        let should_show_notification = should_show_notification.await?;
+        if should_show_notification {
+            workspace.update(&mut cx, |workspace, cx| {
+                workspace.show_notification(0, cx, |cx| {
+                    cx.build_view(|_| UpdateNotification::new(version))
+                });
+                updater
+                    .read(cx)
+                    .set_should_show_update_notification(false, cx)
+                    .detach_and_log_err(cx);
+            })?;
+        }
+        anyhow::Ok(())
+    })
+    .detach();
+
+    None
+}
+
+impl AutoUpdater {
+    pub fn get(cx: &mut AppContext) -> Option<Model<Self>> {
+        cx.default_global::<Option<Model<Self>>>().clone()
+    }
+
+    fn new(
+        current_version: SemanticVersion,
+        http_client: Arc<dyn HttpClient>,
+        server_url: String,
+    ) -> Self {
+        Self {
+            status: AutoUpdateStatus::Idle,
+            current_version,
+            http_client,
+            server_url,
+            pending_poll: None,
+        }
+    }
+
+    pub fn start_polling(&self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
+        cx.spawn(|this, mut cx| async move {
+            loop {
+                this.update(&mut cx, |this, cx| this.poll(cx))?;
+                cx.background_executor().timer(POLL_INTERVAL).await;
+            }
+        })
+    }
+
+    pub fn poll(&mut self, cx: &mut ModelContext<Self>) {
+        if self.pending_poll.is_some() || self.status == AutoUpdateStatus::Updated {
+            return;
+        }
+
+        self.status = AutoUpdateStatus::Checking;
+        cx.notify();
+
+        self.pending_poll = Some(cx.spawn(|this, mut cx| async move {
+            let result = Self::update(this.upgrade()?, cx.clone()).await;
+            this.update(&mut cx, |this, cx| {
+                this.pending_poll = None;
+                if let Err(error) = result {
+                    log::error!("auto-update failed: error:{:?}", error);
+                    this.status = AutoUpdateStatus::Errored;
+                    cx.notify();
+                }
+            })
+            .ok()
+        }));
+    }
+
+    pub fn status(&self) -> AutoUpdateStatus {
+        self.status
+    }
+
+    pub fn dismiss_error(&mut self, cx: &mut ModelContext<Self>) {
+        self.status = AutoUpdateStatus::Idle;
+        cx.notify();
+    }
+
+    async fn update(this: Model<Self>, mut cx: AsyncAppContext) -> Result<()> {
+        let (client, server_url, current_version) = this.read_with(&cx, |this, _| {
+            (
+                this.http_client.clone(),
+                this.server_url.clone(),
+                this.current_version,
+            )
+        })?;
+
+        let mut url_string = format!(
+            "{server_url}/api/releases/latest?token={ZED_SECRET_CLIENT_TOKEN}&asset=Zed.dmg"
+        );
+        cx.update(|cx| {
+            if cx.has_global::<ReleaseChannel>() {
+                if let Some(param) = cx.global::<ReleaseChannel>().release_query_param() {
+                    url_string += "&";
+                    url_string += param;
+                }
+            }
+        })?;
+
+        let mut response = client.get(&url_string, Default::default(), true).await?;
+
+        let mut body = Vec::new();
+        response
+            .body_mut()
+            .read_to_end(&mut body)
+            .await
+            .context("error reading release")?;
+        let release: JsonRelease =
+            serde_json::from_slice(body.as_slice()).context("error deserializing release")?;
+
+        let should_download = match *RELEASE_CHANNEL {
+            ReleaseChannel::Nightly => cx
+                .try_read_global::<AppCommitSha, _>(|sha, _| release.version != sha.0)
+                .unwrap_or(true),
+            _ => release.version.parse::<SemanticVersion>()? <= current_version,
+        };
+
+        if !should_download {
+            this.update(&mut cx, |this, cx| {
+                this.status = AutoUpdateStatus::Idle;
+                cx.notify();
+            })?;
+            return Ok(());
+        }
+
+        this.update(&mut cx, |this, cx| {
+            this.status = AutoUpdateStatus::Downloading;
+            cx.notify();
+        })?;
+
+        let temp_dir = tempdir::TempDir::new("zed-auto-update")?;
+        let dmg_path = temp_dir.path().join("Zed.dmg");
+        let mount_path = temp_dir.path().join("Zed");
+        let running_app_path = ZED_APP_PATH
+            .clone()
+            .map_or_else(|| cx.update(|cx| cx.app_path())?, Ok)?;
+        let running_app_filename = running_app_path
+            .file_name()
+            .ok_or_else(|| anyhow!("invalid running app path"))?;
+        let mut mounted_app_path: OsString = mount_path.join(running_app_filename).into();
+        mounted_app_path.push("/");
+
+        let mut dmg_file = File::create(&dmg_path).await?;
+
+        let (installation_id, release_channel, telemetry) = cx.update(|cx| {
+            let installation_id = cx.global::<Arc<Client>>().telemetry().installation_id();
+            let release_channel = cx
+                .has_global::<ReleaseChannel>()
+                .then(|| cx.global::<ReleaseChannel>().display_name());
+            let telemetry = TelemetrySettings::get_global(cx).metrics;
+
+            (installation_id, release_channel, telemetry)
+        })?;
+
+        let request_body = AsyncBody::from(serde_json::to_string(&UpdateRequestBody {
+            installation_id,
+            release_channel,
+            telemetry,
+        })?);
+
+        let mut response = client.get(&release.url, request_body, true).await?;
+        smol::io::copy(response.body_mut(), &mut dmg_file).await?;
+        log::info!("downloaded update. path:{:?}", dmg_path);
+
+        this.update(&mut cx, |this, cx| {
+            this.status = AutoUpdateStatus::Installing;
+            cx.notify();
+        })?;
+
+        let output = Command::new("hdiutil")
+            .args(&["attach", "-nobrowse"])
+            .arg(&dmg_path)
+            .arg("-mountroot")
+            .arg(&temp_dir.path())
+            .output()
+            .await?;
+        if !output.status.success() {
+            Err(anyhow!(
+                "failed to mount: {:?}",
+                String::from_utf8_lossy(&output.stderr)
+            ))?;
+        }
+
+        let output = Command::new("rsync")
+            .args(&["-av", "--delete"])
+            .arg(&mounted_app_path)
+            .arg(&running_app_path)
+            .output()
+            .await?;
+        if !output.status.success() {
+            Err(anyhow!(
+                "failed to copy app: {:?}",
+                String::from_utf8_lossy(&output.stderr)
+            ))?;
+        }
+
+        let output = Command::new("hdiutil")
+            .args(&["detach"])
+            .arg(&mount_path)
+            .output()
+            .await?;
+        if !output.status.success() {
+            Err(anyhow!(
+                "failed to unmount: {:?}",
+                String::from_utf8_lossy(&output.stderr)
+            ))?;
+        }
+
+        this.update(&mut cx, |this, cx| {
+            this.set_should_show_update_notification(true, cx)
+                .detach_and_log_err(cx);
+            this.status = AutoUpdateStatus::Updated;
+            cx.notify();
+        })?;
+        Ok(())
+    }
+
+    fn set_should_show_update_notification(
+        &self,
+        should_show: bool,
+        cx: &AppContext,
+    ) -> Task<Result<()>> {
+        cx.background_executor().spawn(async move {
+            if should_show {
+                KEY_VALUE_STORE
+                    .write_kvp(
+                        SHOULD_SHOW_UPDATE_NOTIFICATION_KEY.to_string(),
+                        "".to_string(),
+                    )
+                    .await?;
+            } else {
+                KEY_VALUE_STORE
+                    .delete_kvp(SHOULD_SHOW_UPDATE_NOTIFICATION_KEY.to_string())
+                    .await?;
+            }
+            Ok(())
+        })
+    }
+
+    fn should_show_update_notification(&self, cx: &AppContext) -> Task<Result<bool>> {
+        cx.background_executor().spawn(async move {
+            Ok(KEY_VALUE_STORE
+                .read_kvp(SHOULD_SHOW_UPDATE_NOTIFICATION_KEY)?
+                .is_some())
+        })
+    }
+}
diff --git a/crates/auto_update2/src/update_notification.rs b/crates/auto_update2/src/update_notification.rs
new file mode 100644
index 0000000000..b77682c9ae
--- /dev/null
+++ b/crates/auto_update2/src/update_notification.rs
@@ -0,0 +1,87 @@
+use gpui::{div, Div, EventEmitter, ParentComponent, Render, SemanticVersion, ViewContext};
+use menu::Cancel;
+use workspace::notifications::NotificationEvent;
+
+pub struct UpdateNotification {
+    _version: SemanticVersion,
+}
+
+impl EventEmitter<NotificationEvent> for UpdateNotification {}
+
+impl Render for UpdateNotification {
+    type Element = Div<Self>;
+
+    fn render(&mut self, _cx: &mut gpui::ViewContext<Self>) -> Self::Element {
+        div().child("Updated zed!")
+        // let theme = theme::current(cx).clone();
+        // let theme = &theme.update_notification;
+
+        // let app_name = cx.global::<ReleaseChannel>().display_name();
+
+        // MouseEventHandler::new::<ViewReleaseNotes, _>(0, cx, |state, cx| {
+        //     Flex::column()
+        //         .with_child(
+        //             Flex::row()
+        //                 .with_child(
+        //                     Text::new(
+        //                         format!("Updated to {app_name} {}", self.version),
+        //                         theme.message.text.clone(),
+        //                     )
+        //                     .contained()
+        //                     .with_style(theme.message.container)
+        //                     .aligned()
+        //                     .top()
+        //                     .left()
+        //                     .flex(1., true),
+        //                 )
+        //                 .with_child(
+        //                     MouseEventHandler::new::<Cancel, _>(0, cx, |state, _| {
+        //                         let style = theme.dismiss_button.style_for(state);
+        //                         Svg::new("icons/x.svg")
+        //                             .with_color(style.color)
+        //                             .constrained()
+        //                             .with_width(style.icon_width)
+        //                             .aligned()
+        //                             .contained()
+        //                             .with_style(style.container)
+        //                             .constrained()
+        //                             .with_width(style.button_width)
+        //                             .with_height(style.button_width)
+        //                     })
+        //                     .with_padding(Padding::uniform(5.))
+        //                     .on_click(MouseButton::Left, move |_, this, cx| {
+        //                         this.dismiss(&Default::default(), cx)
+        //                     })
+        //                     .aligned()
+        //                     .constrained()
+        //                     .with_height(cx.font_cache().line_height(theme.message.text.font_size))
+        //                     .aligned()
+        //                     .top()
+        //                     .flex_float(),
+        //                 ),
+        //         )
+        //         .with_child({
+        //             let style = theme.action_message.style_for(state);
+        //             Text::new("View the release notes", style.text.clone())
+        //                 .contained()
+        //                 .with_style(style.container)
+        //         })
+        //         .contained()
+        // })
+        // .with_cursor_style(CursorStyle::PointingHand)
+        // .on_click(MouseButton::Left, |_, _, cx| {
+        //     crate::view_release_notes(&Default::default(), cx)
+        // })
+        // .into_any_named("update notification")
+    }
+}
+
+impl UpdateNotification {
+    pub fn new(version: SemanticVersion) -> Self {
+        Self { _version: version }
+    }
+
+    pub fn _dismiss(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) {
+        cx.emit(NotificationEvent::Dismiss);
+    }
+}
diff --git a/crates/gpui2/src/app.rs b/crates/gpui2/src/app.rs
index b5083b97c2..ca96ba210e 100644
--- a/crates/gpui2/src/app.rs
+++ b/crates/gpui2/src/app.rs
@@ -492,6 +492,10 @@ impl AppContext {
         self.platform.open_url(url);
     }
 
+    pub fn app_path(&self) -> Result<PathBuf> {
+        self.platform.app_path()
+    }
+
     pub fn path_for_auxiliary_executable(&self, name: &str) -> Result<PathBuf> {
         self.platform.path_for_auxiliary_executable(name)
     }
diff --git a/crates/workspace2/src/notifications.rs b/crates/workspace2/src/notifications.rs
index 7277cc6fc4..b1df74c61a 100644
--- a/crates/workspace2/src/notifications.rs
+++ b/crates/workspace2/src/notifications.rs
@@ -15,6 +15,8 @@ pub enum NotificationEvent {
 
 pub trait Notification: EventEmitter<NotificationEvent> + Render {}
 
+impl<V: EventEmitter<NotificationEvent> + Render> Notification for V {}
+
 pub trait NotificationHandle: Send {
     fn id(&self) -> EntityId;
     fn to_any(&self) -> AnyView;
@@ -164,7 +166,7 @@ impl Workspace {
 }
 
 pub mod simple_message_notification {
-    use super::{Notification, NotificationEvent};
+    use super::NotificationEvent;
     use gpui::{AnyElement, AppContext, Div, EventEmitter, Render, TextStyle, ViewContext};
     use serde::Deserialize;
     use std::{borrow::Cow, sync::Arc};
@@ -359,7 +361,6 @@ pub mod simple_message_notification {
     //     }
 
     impl EventEmitter<NotificationEvent> for MessageNotification {}
-    impl Notification for MessageNotification {}
 }
 
 pub trait NotifyResultExt {
diff --git a/crates/zed2/Cargo.toml b/crates/zed2/Cargo.toml
index c82f1eef5d..ec665e5f42 100644
--- a/crates/zed2/Cargo.toml
+++ b/crates/zed2/Cargo.toml
@@ -18,7 +18,7 @@ path = "src/main.rs"
 ai = { package = "ai2", path = "../ai2"}
 # audio = { path = "../audio" }
 # activity_indicator = { path = "../activity_indicator" }
-# auto_update = { path = "../auto_update" }
+auto_update = { package = "auto_update2", path = "../auto_update2" }
 # breadcrumbs = { path = "../breadcrumbs" }
 call = { package = "call2", path = "../call2" }
 # channel = { path = "../channel" }
diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs
index 5206514dfe..11c45ef57e 100644
--- a/crates/zed2/src/main.rs
+++ b/crates/zed2/src/main.rs
@@ -186,7 +186,7 @@ fn main() {
         cx.set_global(Arc::downgrade(&app_state));
 
         // audio::init(Assets, cx);
-        // auto_update::init(http.clone(), client::ZED_SERVER_URL.clone(), cx);
+        auto_update::init(http.clone(), client::ZED_SERVER_URL.clone(), cx);
 
         workspace::init(app_state.clone(), cx);
         // recent_projects::init(cx);
diff --git a/crates/zed2/src/zed2.rs b/crates/zed2/src/zed2.rs
index e2e113c9b0..54f95a1d3d 100644
--- a/crates/zed2/src/zed2.rs
+++ b/crates/zed2/src/zed2.rs
@@ -162,7 +162,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
             // status_bar.add_right_item(cursor_position, cx);
         });
 
-        //     auto_update::notify_of_any_new_update(cx.weak_handle(), cx);
+        auto_update::notify_of_any_new_update(cx);
 
         //     vim::observe_keystrokes(cx);
 

From bf324c152b1f284927d0e39d2d33bd8f3191fdf3 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Fri, 17 Nov 2023 17:14:48 -0800
Subject: [PATCH 11/17] Add bump nightly script

---
 script/bump-nightly | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100755 script/bump-nightly

diff --git a/script/bump-nightly b/script/bump-nightly
new file mode 100755
index 0000000000..92cdd191eb
--- /dev/null
+++ b/script/bump-nightly
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+branch=$(git rev-parse --abbrev-ref HEAD)
+if [ "$branch" != "main" ]; then
+  echo "You must be on main to run this script"
+  exit 1
+fi
+
+git pull --ff-only origin main
+git tag -f nightly
+git push -f origin nightly

From ee753beebddcf9b8c26b1cbf89e736d670b11ce6 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 17 Nov 2023 17:21:24 -0800
Subject: [PATCH 12/17] Build nightly release based on 'nightly' tag, not any
 tag w/ nightly prefix

---
 .github/actions/run_tests/action.yml  | 8 --------
 .github/workflows/ci.yml              | 6 ++++++
 .github/workflows/release_nightly.yml | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
index cfb890a45a..af84a4f139 100644
--- a/.github/actions/run_tests/action.yml
+++ b/.github/actions/run_tests/action.yml
@@ -32,11 +32,3 @@ runs:
         RUSTFLAGS: -D warnings
       shell: bash -euxo pipefail {0}
       run: cargo nextest run --workspace --no-fail-fast
-
-    - name: Build collab
-      shell: bash -euxo pipefail {0}
-      run: cargo build -p collab
-
-    - name: Build other binaries
-      shell: bash -euxo pipefail {0}
-      run: cargo build --workspace --bins --all-features
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 037ac228a9..65475a41b9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,12 @@ jobs:
       - name: Run tests
         uses: ./.github/actions/run_tests
 
+      - name: Build collab
+        run: cargo build -p collab
+
+      - name: Build other binaries
+        run: cargo build --workspace --bins --all-features
+
   bundle:
     name: Bundle app
     runs-on:
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index fc59137d93..99506db976 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 1 * * *"
   push:
     tags:
-      - "nightly*"
+      - "nightly"
 
 env:
   CARGO_TERM_COLOR: always

From 70d0421b3ca29efc9d725ed94e928cb1f089fcf5 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Fri, 17 Nov 2023 17:44:11 -0800
Subject: [PATCH 13/17] Fix bundle script

---
 .github/workflows/release_nightly.yml         |   2 +-
 .../nightly/embedded.provisionprofile         | Bin 0 -> 12512 bytes
 crates/zed2/Cargo.toml                        |   5 ++--
 .../nightly/embedded.provisionprofile         | Bin 0 -> 12512 bytes
 script/bundle                                 |  24 ++++++++++--------
 5 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 crates/zed/contents/nightly/embedded.provisionprofile
 create mode 100644 crates/zed2/contents/nightly/embedded.provisionprofile

diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index 99506db976..447e928866 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -92,7 +92,7 @@ jobs:
         run: script/generate-licenses
 
       - name: Create app bundle
-        run: script/bundle
+        run: script/bundle -2
 
       - name: Upload Zed Nightly
         run: script/upload-nightly
diff --git a/crates/zed/contents/nightly/embedded.provisionprofile b/crates/zed/contents/nightly/embedded.provisionprofile
new file mode 100644
index 0000000000000000000000000000000000000000..8979e1fb9fb72e9f5adbbc05d3498e6218016581
GIT binary patch
literal 12512
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

literal 0
HcmV?d00001

diff --git a/crates/zed2/Cargo.toml b/crates/zed2/Cargo.toml
index ec665e5f42..edc1123698 100644
--- a/crates/zed2/Cargo.toml
+++ b/crates/zed2/Cargo.toml
@@ -167,13 +167,12 @@ osx_info_plist_exts = ["resources/info/*"]
 osx_url_schemes = ["zed-dev"]
 
 [package.metadata.bundle-nightly]
-# TODO kb different icon?
 icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]
-identifier = "dev.zed.Zed-Nightly"
+identifier = "dev.zed.Zed-Dev"
 name = "Zed Nightly"
 osx_minimum_system_version = "10.15.7"
 osx_info_plist_exts = ["resources/info/*"]
-osx_url_schemes = ["zed-nightly"]
+osx_url_schemes = ["zed-dev"]
 
 [package.metadata.bundle-preview]
 icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]
diff --git a/crates/zed2/contents/nightly/embedded.provisionprofile b/crates/zed2/contents/nightly/embedded.provisionprofile
new file mode 100644
index 0000000000000000000000000000000000000000..8979e1fb9fb72e9f5adbbc05d3498e6218016581
GIT binary patch
literal 12512
zcmdUV36v9M);8TVTeB*-iv&awnkJP!Q9x@;Qb{UFRVpirR;ntMr7C+;N!*}SRKRg#
zbW}tXonhP+k#S>0{S<XXTyO*xXT)U`9F@^w7+k)$l3r0~{{Ni+%=i6$PMyyC*1Ny=
zKKHrz7Ssd1J95mNWzJ;>#<z`XU)uw{0`)*IwzswE#zJF8j_8^&y#4qQ!=RpN)q!Sh
zYkQ`N9X->y`DfN-NmCVyrBp7vV1{lUG(#g~xg4L$iVJ208GE;N#+eH{=TFCcC=>PL
zn!J=Ml{Nk#;vrDYjBc$K&gUgTtHl^h<M$8&MgzvsYH{xj&5UHZoIhQwRTO0&tG1fQ
z<z%&CN$W4>@<Op(_kh8=L5F#KnV$isX^lQ)IiQwLapi@bW9Das`a&=rfq7Y3n6Fif
zpte*lg2k#YGz6we<cgZIP%48eO)9J5g{mOs^0JUE&)4?092iMTacmiEoZ!LxR3ar5
z{Y4>>s`Zb}7K`lQNl40M3dKC$7&Uk_ZGSU$NoY}M4vMkmfkpD5uuu=_4c$7ZTc=}m
zrqlJ-(~bJrd~Nep@0$D)TLwFjf3$%9ZTbR{pP!m2MZnbwB%5VLf$twA!Ad1T+joLk
z>qvwm3T^;w8XSR8>Tlb(l`-?dy4ZyzLD<U}iXyJM2rC2viv;0H3O<J~q0h!h1*4)a
zcP>UGtDG06a1TPkiooDy5-mAkT@Z&AB||$x`dGMD<s6|pflD}ndnGPQ=VP*zjz;Kw
zTyGSqNC;vbwmKW3O=KXdxZo%jq9_lB=n&3{lwtt{i$z=z8;<3pdOP@Us}Q(d$2-8x
zvIK!S84|&pbE2Z+rXq+EcLc>i*p&99aSsV+n(vS#iH1U?;!JX0GL0)f23N>5(I7F>
z6mHf<)w)`5oiUt7kz503Nknv@q8xDLWX77RWx!rZG^3-vOeh@A)O=wHuhAHSBBD2h
zz$EE|Xo;6YrMLl+xD?`|QKY#KHtbFE4yhVX=ftoa%7F8z#GIi9?{wv35wfI~qjjU`
z#)piZCuvf_sopbz^WGp6)P<xx$w+ycq#?zjG~c-~gl1!5O5Jyck9Z+)HWF7?e)b$h
z5l@jY<Uj)jM}UYMFbYRtDhR_y0>Knm0q@;#4%|D1c@wgo&5A@e>gNSc%t2Aw<O}gB
zPc4(McmX<~j0lBm1p~@xd3RbLF6)RmN@Q4CLIrKkNJk4H)=?`^dCH7xJy@2rX3c?Y
z(O^txSs`FI3(k^HqDv*#m_c9z6r%HCkB2N7rF=QZ2lR=$lue|qJZWo4_HqMiRBd&{
zP%gUlNv{rNJoQ>cX&5|_n5|N#U^`h5xLhO|62oY`m`kT*f88Dmm0k6W&DT}tyiAqK
z+3<KeTIM{kU}Jc#POnE8Igzc&MGve<g-|H%vd07iEErw9M^R#kj<%%gcs-KV%b9e^
z0pU(3uh+47ImXtjM8j#vP{dhwrqc~X*N9{xI}wV7{q?vL%f|?pm#ZZr3={Sdx^gHY
z$%5i;z#@sjup=#s1Os#p#TqaWHE+mCgZhLOhtn{qu&T1l6ABe25f--Fxrl}J_zli_
zG)H5i)?;>h0*$({#s^6pcA%>6Q9(PR;0S_IK)zuG5yc`R;&z1M6gV2quudA{uw2!n
zx1~7)T#2^yr4rTK%Dr_8S=VJ^kyt*4!FsSZ#Hq?34T%W&4R(scbW=XSdNYM&Cgrf{
zy%~hU6)|B{M2;M^4gw_!haMvwjUdnoHf#s;1VvTvf&S*XI+7l&+d$V-LI6p|vl)?d
z*z3GABSs_M1|QY|Sw@mkJ-`nqos7#~iE!9t!b#^qAAldB3gNIToTH{<L`v0v&Y-rV
zlblR}xkB}LgcPGdHwcHf3hMJsUCfeTEm0BZi{wFnv=$|<2jdyQ8e08+gk7A|m5dr_
zFlTE%Fi$xaHbGq7sCdOF;Z~vuLIs_$h=<*B65^e(*;BU}cmsFXxevibDLM!fJq<YA
zl#4*HDHj+9y9eDV1~*{7`JOW3c99B(iw;U)5gcwP@u(qG_i*W0GK-ZG!JvYP&3p92
zlvArJHY^HF8ADSo42bF}2OPk0oKpNicIqSpo4})xnED_93&GtEZc9NeSrvou;aGwy
zEi8d4IBYJOas`VdxI>U%X+V<6k}u=3F6nictAU0qV^G{yYcfYVIKSDL#Zy|W<j09F
zf^(GPHm^_2hdlaZrRao^Y7+PB0xoY|wwSR{kXF(tM9BV{)`?)OJ&h!B4;F~0U|e){
zp?*1U333)CTY@Y?98QrgM?~P=Zk9sw)mk;I%X$)ayyh`l%{qjP8TeYz%9s>)F5J~f
z%N7Rrd)PV^farV`tz_(ufVFOrv=(pKRw_an*-ZFL4a!jQa?S`qcXx%a$yAri%7js~
z&74WgkZ9DUbFq?JFr||X9iE}m?rOmpx5k}hkX7<*ChbO1KAuTvOIbHk*5id7q%Tnr
z0l6qMWq`~2q)i}%0H?L_G^dprr>_<@rHdlj08FK6rU8BEBO$#^0>kNUTqSY>-woJS
zA|(wWBTdWhrQyNWn?rL1;q@{oiZM6}EL;tskrxpqF_{sO7zMBeAPB5#z5-BYz+yOI
z7SvU7TogTJGD@Ik1_r{yhk;f%R7(x|AwV)n6yQ%V=*`8#-Xa(uNF7X~5?}z~P%sYF
z^1K{G;iOyumRxOH0_;GJ8(d`)4ubABCXB%h2Af=*E}4$&X^ByhB+N@O7+5U~jsfdO
zak5R%M!bMkm>N{LR#MpqxEF~7Xs88Rg26S6lS3^loT0)0U<6|T17P49$>2INEkdM}
zQ=FpW3pql`cu>ly+N?5<ScFi361bTVuJeXsEQ6caAOk1Bn(TrT$#Zgxna~b96r(w>
z7XwT}MNcMJ_hD2$oQ6dVP6lIPdzq2#<rt*|{{;(B2ug_rovtciN~Ktk&I2^7vtbut
zJ%B+-w25;BNhCwNf|(E&!r%-B)4nJ`NernqS%A8C!j9DAhFG4{gFZ4~8+Bj<WSh)}
zYZ72-qyy?l%qFV}glQ?>VrLR3A@vy8w}7elc^K<J6%qj!H4vmo7sg9~F`1$aRr7=?
z1Bpe;UM!UIrXW)^O&C1jT%&1T_F>+nw-MDx8*l}KC6y7mXxx;Hhl3;$1nU4i6EG!k
z=Y)#Z4X{sjz4>?wQ7w@aci0plD;02w77PjDeRV+2hOk4xq!dD=L>ko^WSTLvtW7FJ
zTwSCYO<F2Uj6p-SQi9FNak;E>+T#`^s)zzkVmKJvAwlsz1UH}v1OxUHN0E9O?gHi=
z$Q?9*+D)t3&tl8$;Ik7Ic8Ht=OkfYuiU3%jN6JevR0q}{RosdqH?6MRya&l64`z<0
zBxmqeqk0L*Dd-obtMRZsAJ38`9LOmorKJBwUr3cRPk4y@9?n`7H>`wNeaIBmCzEX0
zSdNChz#4lSo-hyOCZuo;*aviG2;=mm3L^NksEmbb0Nv;0e(%7;MXV{W#~v^R6;!o;
zz&mK9A>av+O00p$fxz~827x}79+YiW9tB(_0GA1zYy8JN0ESY$7^#qqSo1NkzUcup
zGDGXqNS35ailfE8F${6_c_e|j-Ub101|d*Lq#I<-m4-7d51>RkRe5&Qq<`z}3^02)
z(6PR;U2&PLkW@)QTk|?_#T5!R5Iw+52T})?nl#z~t~!uF1pyQ?1?veIai#N~h7RTm
zOgU2rE*nh($Us9@E}UkvPR@?RV^}3DBZ0gj<}4?ebegHuYIr%K)j2KEdQ>vF%uzbd
zG!Q=?%E8)DGK#q)I;>vvA`r*$d?6y4_$nD{l-(wsg}|!ON{ER?@^Z!};ck-kqQFWh
zy-d-EAW_`zsVIhmJxUr=Y@R5@3`JlT&04lz4-`qb#cXjEn-$7Vsum$({RxJGJ4iSO
z7-ehUz-$0i6=Bj5L`e$8%$yUqOGY-rP*J^LsM;Kg55{AjinpsyCjl)7Fd*dW$-G?k
zDWX4^^@o{SHeh7ST?L{B#&GE5R1$ORU_+3x>b+FM45ehBMCvW+IG>A@^;Dv6C*`ha
zGR0#Vk6l;w1X+<ZBO+!pyX$V%CRPB3h^}%Dm^7FofDt9VmTF4NIK;}~YX=mk=4imN
zmaLE@p6QhpyQ>;EP$C84q9=ej$p$WyC}3m2lSUPV@6#7bAF2bK0vO)wO{NfpkI*?_
zEAxOY*YE~Rx5mx^eeaXQre|408?dYOF3P}C2zbp#VE=G{*+d;+IC#i9uz#Qq{KtqI
zQ2rM4v*#2pJ+L0&+4rv}XpjI_hk))%06#<7K0Dad4UGCv=tWFrrGxdNPgY<Bcft_R
z4LDZJ+hf&4%$kKbqduJ{;-Qi*=#^=AJx1r`MA1b!Eh$?_^c#Gxg1II+J#|afXQq%c
zj5D;e#<~i6F^guTR3#!Kvdy2c7t&&a10D~hV5$dBLrjZR2Z8V0<Qoa~tepW8cVKW>
zL;{wQ*PIMvK0+=8+%j+OstT2=zEsK-8i->MqX)#CGLx7%#DgGVhhvZjQH>hBil^Uh
z0FNeMYu15iM!DtD0gne@6!3<!WCJ!d*Fsx?p@S<VS{K~~IG0Sta=epPd?_pF>na^K
zUa}c|iKuc(r=wx6;gP-dI3Rb;v3k7?AtRW5L@wmQ#S~rAccp8&jL@Jkx19NDT?QC7
z#DhrUfLp5G!{Iv40Uf7M5($!psKrq<#qz9KNEkwmAgq&0MadJ4lB|cXpoSXjsiBdE
zC|A72lHj$H9F-Lcf-jZO7kPzHq6{fo16gfXl&gb)ArZrLdO_#NKq67)izboCJ8L>7
zuLEQyRZA7Z+EUbI!1KV*U=%G`r~_MvA!(rJKnD6EVYnkv!Q?`%93~F4b;SQ-U4aF=
z0@Z;$KqNx|-6o7)Mq<@EZv)l=9<098H9bAtSaYZ0TnjHqk_Z8mu@j=oNqJdna(gyx
z$~HNsK9*NK?x0@EHhE^_|1KgIW?%*pIS@%m`}`Dv0A1+)O(KZmMPZmGt3i*`Ym^dj
zB&T>1SvVT#5{mJlJpfz6=6s|Ofx2o1eM%0Yt_;QbN<LjI6R)_<b=sBiM@vZ(3z~CA
zeHaDIC6{DVfrKZU1CcI9<uJh#;P!)cm{5REahU$nX4;Z7rjo%-0ChPUakJl%qAgyS
zEU*lsuDLJDqUtX=L%=Plfe3)Azpik91mNH3uNOoVa7Z0Pj73`!AUJ@eK}0gu08hW~
z#;0R&5Fwo<MHn;}h}0@^s#XmBbc98Xx<K(dk^+$v9j6D8NJq#R)z`ppNsZQ;2uG|6
zB9}4`BB)J&14K!{T|<Ct1D{I){M-tnwyh{@(?@ZJ(!8@3T>%j!5b5o;J5Jz#s1X|j
zctAvC2seO@b}^Lo2dp}(f;PIsUEm1Wl9se;t0Zh}?ip)w1HdW>CvcwpgQHCtqWYvi
z!VMIL0B+zEO5k}u!3DwrGvrRoVMo;?`1zWfbJu;^x-FGJjbW?99jX|ysuxZnIk78&
zmN`DkQw70WLkuM;7;q306*PuJoWmL_1!{t>>gGIY2MY75y>|whzOB>vzgOQCf*6cb
zYQ#QD#0WSX#1P=yAQUQ!LPl})%aa<(&tQOi4)yUFnCm}#1wv3NSi@>+6rBV<F7R^)
zeB8p2cEBfeGH|>Z849D00Bo0Fg#sKY2<NCFc#o2(b?}@n1jADxrtXb0kx&=zGv~F|
zLZHSI<*q=CmZ^vlg5YwBEYYSw(u{ir1BL{K%uQKqG=pIMcBL8NCY`EmHTglSi~?Oz
z9di)tP%#HYG8G6!#Rvq%#+-;4EMg*wBF$LH(D#6_t5LXKoKhocw4*6^Sir}d%XAb$
zt7%WxEt)VTRq|(K3orPU0C0>_u^?p$25FBUF!x+72xly88lmw*fQrd6H>q?L3gHx&
zboq-oRAC6aU#Bzs1#!WG{)o?*fxk}hvzZ<9`zbUjaGCyePG9P$H!6gKG*?*?)O6TD
z%BMHI2F6gwX$=H2b-g*e-VB;hoX3_*IW7gVMSM4(li5_Ze~A9<)SN-Nsh=57%>?$Q
z-MUl#dAGg=_m4D?X`2UDFs~u-^I~9Pki7c2DM0Rx1DKxeW;sqMmAb`Zu96?L#Qw|{
z*kW%caL^<}R^A^>Q_tgHA4*wZ<^QvN3|_YyuN$1z#B2Ff@n^G!MxB~9gv>veHT<b`
zC^#$)I4li_{Z&(Ha#u}=_6GuoW<vYhlwe5$ol@ZZ`YvRCxmX#<9Wr3I1Ig0<HvLEY
z<AWWv>w!~k%Bnin&#j!u@)dQBLTRps$a3=rkD}&SnUpLrIZvuO5Y$X%%YrBr7n)5L
zXuh_u)GPPFAc6I-ws-RuL9e&5;B0vdWbQVa;^uB!TyN>tnc|j&)xcWJX72ELL#;%4
z|4@C?=myQ$ceC@g&209<wLKGl1NC$Sp`PIj)(&rPYj2-&#zjjy|N2Jz?H})Z=f<5c
z-Fw>VuTra^@%`!fwy_{zA8)4bhX*@GPHqndbd#YYMuI};<W7+2mW1Z1=uU-Zs+D6W
zPi<8WWOTuWYv4*bnJcEsb=}d>6t&&($>Uq?=v=O>0ao&)W5(+tonB|w*$h^bId;r=
zgIa`Ie=(?{!yu&DbKDuNp5a_k;uWB`s&J{9b)l%C1(3A{6P7eTH^2HJg1XLe?G97_
zPR0%1NpFkhUZI}08G}!wZN#wQJ#7=gCk$<!?LBR6!)`lg*R(_bd~&;c#{3uFI`yB&
z9QgXSlNRzvByRp<@#cGsPu)FtdiJf8R!zTbZh6auN$lP8IoCz5JzFbpz52}R(a!VJ
zkIjDQ#l&}8mmmGw!yWT`9$zAT@Iz;D@4erjk#lZdv*HNymlr;K{x#b66TROOoBx>G
z=-XU-e%J1YUwLt7;)pY1pN_#xSNh-devlk-(XPsBcia8D_Pi>W$=!kNJC3*ZoWA|m
zJ?G3m|DmOy&7L*((0LauJMz$%ao@;KJg-gLDX;mww5v9K{H^(&_V6|5ikEIFDV^)%
z@kj5^FMFbL@|E}1|NilvZ+>^lsrt?{W?r{QbNlMov`db?<-Pf1KiT-*z9r#_$E-QC
z>+)Go9B3cjHmq&k(l4N;`=BGi!A_mr*7ifkXlNw(*WNY^nx@vB+;J>)^pYuE+f$BJ
z)iK|How;h>S-(EuATJ)h7{W%5?i$%PV#KJnwhk*~hKzk>sBPJ4y<ctQxKe)5XB%n}
zGIX=5@D+jha4a-Won~6cEa(*I<h9e+PFps$w<}ka2K7{1&jVG^RJHwtj-xxK9Jk`e
zt6YoNTKMa`&Ndyn+%|g8gB56k`g)?elMbLIBcVwnJDXp%aQw*jwvKk75<@iv$VA()
z*mI^kc7EKshQ4E1&kW_2qV}4DGai_7${+6TM9#bJnWrjK_j+DB>Z6M?XH8msXc1l>
z|7GLCE3VzPn_Gcg`TDW%!y6)NMvlJR`QBL%oV?@ny>rj|Xz!gDpZMwOOWs;_t|x9=
z?!ABVRTrYadw21@n~yzf|Hl*Oo-_ISug(|NKa+Is{^5}uZW(t-Z(g%z{4dY7cCNVL
z^&_QCE5`ofj|=zZ+V0*);^)0{X(18+=r{p-W%&<y;86C^6$<*SlRJ2T+E83v{~+}0
zlTTdwm^D_r{|G1j#CX$+RlEOCzB%~~ao(zX_pje@)Us=~{{cdmz41}LoqA;H)9Y`1
z^Rv$$Tsh{fFRa%;{K|~sdqq^(iUVMI0szap7O=Fn4?d$2|2Y&<Wk_$*>x_`0i6SOQ
z57~N){}CkncaZVnwZ9!R?b>%va`^X-_<V8w((b+HJHnpez7@w^x%;47`exKUGobdr
z9J}xz{xNS{46pyy!Pj0&te%-UV*9!$K0IO0v(tXLrZMhL$BIR79&Ita{M<xx+mzI6
zFCJI?=9~#TE<X2`{ih6nJa{#E&iJo*)5%A<kBUy+u<F3ySFd^1|M-@OU%YzsBboy*
z-#b^6%RhQ%8?<s0`s&167yPY@IPLhY-*4Oa*o2*nPkig;1shMl@9T*ZhFv%Iq3K7@
zEAN;;{+;;I_pB>i=LiJ1JfMX){NvD`{3{=?^WYav^JM%tz*jz3j*p#m34FO>`O=4=
z$i7&Ier0mQ)l+v1r60t_!jr_?)!PhHgxi%>FLt*eqo=I_K(zWJRhy`)UK2z{K*NCs
z4pP;h#E*XqFg<OmwVJBw=xG}bX6yjZuwL`V@gv%xrTd{deVEhUcJxUqaFl-ZsaO+i
zI93ZSeYU@GJGAuC<Cks#HYdeqIY9&LTsfI4X}E!pnKbdbhRxPBc@}(OrU9(AA`2yr
z$_n%4R-XjuBdAYSqs{^7XdIZ-5_rqAMIL-VR+K@9EU)2mSw7XWZMlS|QWEA4nJAwF
zebvc8%l`RQ)0;1{Tp7?Pb<A>$ZqGYRHJk8tw)rMccWu+>D{p!CZ^|wEtFJ4NZ_BjH
zF1hT4n-(}M`+s}OS-+V3=0n#U`S#|oOSk;>b$;T@b)WI=I~E?S{gBx@YTt#nOI8Fl
zZ&;su==V4KIx|0XeH;DFh%px&b5`hxlge*wT5<9jj&(b7Ge6k-+NS*b6Y)RKdg&{<
z_W36pk2z-jyBEzcy>!ZsofF^6ym`mWlaDxX`@L6}mY(<g35&*PuY33(nDfi?tZR<?
zX2GeVX1O7KV0_Q3yZ5fs9t@-x@lSIG<-qBq=7#p}nmB#JuE$Hq`8Mt}U%ch=;LhLN
z^q3ww^!ARznu~6yH=Xd*^~lU4=e#g+>Z9c9#oSi+l4JaLFW<52!*92b8D)8}Qkf3*
zj9396tki<9Nk@TOIrjNQmV4^g&AU0X`P{)rrgEbHAwHtgBt2w>^m?7n3RwY7(wiZx
z0Wc*{w8S79e8D&u$a}}|ai@?hr||_ek)I^qnm|faiTM8m4z&N&b0VVwpct;0VA*}m
z$Pas_JuvI_;fv_><5xaA=j#)D4)z3AOdho-{?0S6y=xdYectRB&^um7-kW;i=#hIv
zr>)w&4!QS)?1F6*Z}?=EY4%-{FaPN218t|Bv@p5$Q^JLA`18yYrv7Qn<L9QoS+ikU
z;h#q`+eY2F`q$l?voDVR9kKAZCzqV?*t^R*jc+~k_UMlv{c`fT?|ePwiD$oEo!hkW
zsvW<30hPB@zu5XG+md_VsK0aHlrt>z7u<Hig+Y6M_n|iqes$j+XWsb&zR0=jg}W>(
z8h=jgcmzfl1~mtAg7V}ksr&ZlT~izNY<<sTo$uWK@Ts%+{Yl^T<vqKu+IdfUmG${o
zmpywBasO@WmR>+>w?aMbMrd3=fVD$I`Oi;MjeH-R0RF>6aj3hm47D$t-bZ49LYD^7
z7?AELiYDNU79m}K^R{KD{7bsj>IAG~Pg|4ysDL;H6efXZ+z>$g{&0{R_x~rznfuNL
z!1|n@hV=oc6xco&1%lKYoYpZL0(5dMpp(m{_1(h|GTD0zL+Rx5eeh++IT-Ebb@8j+
zW4@j;WBcObP#ZUD2{f_)xI4!F9GhJBg}-t9D;pPod&vL!#ubar^KLYp`I7DV)eh6l
z)QYv^e{DUot8u*lqZ#hc*FXKVrmO42mm_C>H(~vQ=Y4q7q2ztDzIbiV{0CQ_vV6`B
z3;*(kX6y%(zg}<pp!3#SRxaNE<oc0g{_C_q?tJ-o^u^Pjeov4!h8s>8aangy=-T|*
zzp;ns-LT=g`?oE*)imSy!tc*FPTO^H{OTDqZwrmJ9liMJUyVL)>8EczcER%edv|@O
zTP6M4xpzN#^B3#ahAXZ|Y^zUVu6psW-T(EMl`G|^EzF+U%lBM<$+E!C_uc%Zr(ycv
zUi;X#^Y&#=8a?973oadZljbP}pY<uc?gjA|o9}*q#G?<aeSFqkuPfDaTyrK*)%CPr
z1N3Pn_;?&zdgcER+_wMN3=Dk6zIN%m(6RlF@|fYevHgWnZP1DRg)t*^69G&cbdXM`
zGwH41OKa%lfwvtx;Dyv~ibGc@<zn(F%eVvlN1yGzWc)U0_CO<}?nLPLL7&jyKFI$7
zJ}E>GG@Yo!Ar$HyIlA>7{_s&i{Q7>kx3>>l0xa1;x$P`yRO`e1QA6ub8*K2v6aX!T
zu}9sz<%PCIU)@N5-?jLYyB(Je8>T(@t^Ue6u}{hqo?kG<t(|}K?PC|}LLXc)Yx@(|
zx+gvA?b@;L_02_o;@)*@4u1Y**Y(?WUjNA7%g?>FY1PH<jZ=>_@7?<T{oVPVM?+_f
z{eIJ=^_P8o*5oU8StF4zpZILH`=b~9XC8a@qL)5wObG|@cOS$)x%!UN^M<+Q#Osqj
zx&HU3k3N6>5f{C2VDUQV0r`_->TQz9{`Q3OpJx93v=7W<e{t*jDZ{T5R=u|6l`k73
zwzTI?T7Ato+r7EcoC~*Z=xFe>FP+piXN-G;uyw~>ohLreZ`wTWSDSCV@`Ka;&}QzT
dW%r!D=*yLl-1Fw1WXXK<LmxembN}I){|3Azi#q@S

literal 0
HcmV?d00001

diff --git a/script/bundle b/script/bundle
index 8c0b3fef87..3a82d25299 100755
--- a/script/bundle
+++ b/script/bundle
@@ -9,6 +9,7 @@ local_arch=false
 local_only=false
 overwrite_local_app=false
 bundle_name=""
+zed_crate="zed"
 
 # This must match the team in the provsiioning profile.
 APPLE_NOTORIZATION_TEAM="MQ55VZLNZQ"
@@ -25,13 +26,11 @@ Options:
   -o    Open the resulting DMG or the app itself in local mode.
   -f    Overwrite the local app bundle if it exists.
   -h    Display this help and exit.
+  -2    Build zed 2 instead of zed 1.
   "
 }
 
-# If -o option is specified, the folder of the resulting dmg will be opened in finder
-# If -d is specified, Zed will be compiled in debug mode and the application's path printed
-# If -od or -do is specified Zed will be bundled in debug and the application will be run.
-while getopts 'dlfoh' flag
+while getopts 'dlfoh2' flag
 do
     case "${flag}" in
         o) open_result=true;;
@@ -51,6 +50,7 @@ do
             target_dir="debug"
             ;;
         f) overwrite_local_app=true;;
+        2) zed_crate="zed2";;
         h)
            help_info
            exit 0
@@ -83,16 +83,19 @@ local_target_triple=${host_line#*: }
 
 if [ "$local_arch" = true ]; then
     echo "Building for local target only."
-    cargo build ${build_flag} --package zed
+    cargo build ${build_flag} --package ${zed_crate}
     cargo build ${build_flag} --package cli
 else
     echo "Compiling zed binaries"
-    cargo build ${build_flag} --package zed --package cli --target aarch64-apple-darwin --target x86_64-apple-darwin
+    cargo build ${build_flag} --package ${zed_crate} --package cli --target aarch64-apple-darwin --target x86_64-apple-darwin
 fi
 
 echo "Creating application bundle"
 pushd crates/zed
 channel=$(<RELEASE_CHANNEL)
+popd
+
+pushd crates/${zed_crate}
 cp Cargo.toml Cargo.toml.backup
 sed \
     -i .backup \
@@ -131,7 +134,8 @@ else
     cp -R target/${target_dir}/WebRTC.framework "${app_path}/Contents/Frameworks/"
 fi
 
-cp crates/zed/contents/$channel/embedded.provisionprofile "${app_path}/Contents/"
+#todo!(The app identifier has been set to 'Dev', but the channel is nightly, RATIONALIZE ALL OF THIS MESS)
+cp crates/${zed_crate}/contents/$channel/embedded.provisionprofile "${app_path}/Contents/"
 
 if [[ -n $MACOS_CERTIFICATE && -n $MACOS_CERTIFICATE_PASSWORD && -n $APPLE_NOTARIZATION_USERNAME && -n $APPLE_NOTARIZATION_PASSWORD ]]; then
     echo "Signing bundle with Apple-issued certificate"
@@ -146,8 +150,8 @@ if [[ -n $MACOS_CERTIFICATE && -n $MACOS_CERTIFICATE_PASSWORD && -n $APPLE_NOTAR
     # sequence of codesign commands modeled after this example: https://developer.apple.com/forums/thread/701514
     /usr/bin/codesign --deep --force --timestamp --sign "Zed Industries, Inc." "${app_path}/Contents/Frameworks/WebRTC.framework" -v
     /usr/bin/codesign --deep --force --timestamp --options runtime --sign "Zed Industries, Inc." "${app_path}/Contents/MacOS/cli" -v
-    /usr/bin/codesign --deep --force --timestamp --options runtime --entitlements crates/zed/resources/zed.entitlements --sign "Zed Industries, Inc." "${app_path}/Contents/MacOS/zed" -v
-    /usr/bin/codesign --force --timestamp --options runtime --entitlements crates/zed/resources/zed.entitlements --sign "Zed Industries, Inc." "${app_path}" -v
+    /usr/bin/codesign --deep --force --timestamp --options runtime --entitlements crates/${zed_crate}/resources/zed.entitlements --sign "Zed Industries, Inc." "${app_path}/Contents/MacOS/zed" -v
+    /usr/bin/codesign --force --timestamp --options runtime --entitlements crates/${zed_crate}/resources/zed.entitlements --sign "Zed Industries, Inc." "${app_path}" -v
 
     security default-keychain -s login.keychain
 else
@@ -166,7 +170,7 @@ else
     # - get a signing key for the MQ55VZLNZQ team from Nathan.
     # - create your own signing key, and update references to MQ55VZLNZQ to your own team ID
     # then comment out this line.
-    cat crates/zed/resources/zed.entitlements | sed '/com.apple.developer.associated-domains/,+1d' > "${app_path}/Contents/Resources/zed.entitlements"
+    cat crates/${zed_crate}/resources/zed.entitlements | sed '/com.apple.developer.associated-domains/,+1d' > "${app_path}/Contents/Resources/zed.entitlements"
 
     codesign --force --deep --entitlements "${app_path}/Contents/Resources/zed.entitlements" --sign ${MACOS_SIGNING_KEY:- -} "${app_path}" -v
 fi

From e43696eb6b0c01c2786175eaff67b62076e4db34 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Fri, 17 Nov 2023 17:46:05 -0800
Subject: [PATCH 14/17] Temporary debug builds for faster ci testing

---
 .github/workflows/release_nightly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index 447e928866..daf1dc3aee 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -92,7 +92,7 @@ jobs:
         run: script/generate-licenses
 
       - name: Create app bundle
-        run: script/bundle -2
+        run: script/bundle -2d
 
       - name: Upload Zed Nightly
         run: script/upload-nightly

From 16f420528d9f5d633836c8adc4ee8e8b370e23e3 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Fri, 17 Nov 2023 18:09:42 -0800
Subject: [PATCH 15/17] Remove CLI from zed2 (for now)

---
 script/bundle | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/script/bundle b/script/bundle
index 3a82d25299..3d40f915cb 100755
--- a/script/bundle
+++ b/script/bundle
@@ -149,7 +149,12 @@ if [[ -n $MACOS_CERTIFICATE && -n $MACOS_CERTIFICATE_PASSWORD && -n $APPLE_NOTAR
 
     # sequence of codesign commands modeled after this example: https://developer.apple.com/forums/thread/701514
     /usr/bin/codesign --deep --force --timestamp --sign "Zed Industries, Inc." "${app_path}/Contents/Frameworks/WebRTC.framework" -v
-    /usr/bin/codesign --deep --force --timestamp --options runtime --sign "Zed Industries, Inc." "${app_path}/Contents/MacOS/cli" -v
+
+    # todo!(restore cli to zed2)
+    if [[ "$zed_crate" == "zed" ]]; then
+        /usr/bin/codesign --deep --force --timestamp --options runtime --sign "Zed Industries, Inc." "${app_path}/Contents/MacOS/cli" -v
+    fi
+
     /usr/bin/codesign --deep --force --timestamp --options runtime --entitlements crates/${zed_crate}/resources/zed.entitlements --sign "Zed Industries, Inc." "${app_path}/Contents/MacOS/zed" -v
     /usr/bin/codesign --force --timestamp --options runtime --entitlements crates/${zed_crate}/resources/zed.entitlements --sign "Zed Industries, Inc." "${app_path}" -v
 

From eb2e9a59b7a28b40f8e38dc868396dacad60c85c Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Fri, 17 Nov 2023 18:27:11 -0800
Subject: [PATCH 16/17] Fix bundling again

---
 .github/actions/run_tests/action.yml | 8 ++++----
 crates/zed2/Cargo.toml               | 2 +-
 script/bundle                        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
index af84a4f139..35d640cb81 100644
--- a/.github/actions/run_tests/action.yml
+++ b/.github/actions/run_tests/action.yml
@@ -1,5 +1,5 @@
-name: 'Run tests'
-description: 'Runs the tests'
+name: "Run tests"
+description: "Runs the tests"
 
 runs:
   using: "composite"
@@ -25,10 +25,10 @@ runs:
       env:
         RUSTFLAGS: -D warnings
       shell: bash -euxo pipefail {0}
-      run: cargo check --tests --workspace
+      run: echo cargo check --tests --workspace
 
     - name: Run tests
       env:
         RUSTFLAGS: -D warnings
       shell: bash -euxo pipefail {0}
-      run: cargo nextest run --workspace --no-fail-fast
+      run: echo cargo nextest run --workspace --no-fail-fast
diff --git a/crates/zed2/Cargo.toml b/crates/zed2/Cargo.toml
index edc1123698..9b3ae6810e 100644
--- a/crates/zed2/Cargo.toml
+++ b/crates/zed2/Cargo.toml
@@ -11,7 +11,7 @@ path = "src/zed2.rs"
 doctest = false
 
 [[bin]]
-name = "Zed2"
+name = "zed2"
 path = "src/main.rs"
 
 [dependencies]
diff --git a/script/bundle b/script/bundle
index 3d40f915cb..19505a05d8 100755
--- a/script/bundle
+++ b/script/bundle
@@ -155,7 +155,7 @@ if [[ -n $MACOS_CERTIFICATE && -n $MACOS_CERTIFICATE_PASSWORD && -n $APPLE_NOTAR
         /usr/bin/codesign --deep --force --timestamp --options runtime --sign "Zed Industries, Inc." "${app_path}/Contents/MacOS/cli" -v
     fi
 
-    /usr/bin/codesign --deep --force --timestamp --options runtime --entitlements crates/${zed_crate}/resources/zed.entitlements --sign "Zed Industries, Inc." "${app_path}/Contents/MacOS/zed" -v
+    /usr/bin/codesign --deep --force --timestamp --options runtime --entitlements crates/${zed_crate}/resources/zed.entitlements --sign "Zed Industries, Inc." "${app_path}/Contents/MacOS/${zed_crate}" -v
     /usr/bin/codesign --force --timestamp --options runtime --entitlements crates/${zed_crate}/resources/zed.entitlements --sign "Zed Industries, Inc." "${app_path}" -v
 
     security default-keychain -s login.keychain

From fd6e47c167d35673b845ceaecaf5275d9f74cdc3 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Fri, 17 Nov 2023 21:52:49 -0800
Subject: [PATCH 17/17] Fix auto update command

---
 .github/actions/run_tests/action.yml   | 4 ++--
 .github/workflows/release_nightly.yml  | 2 +-
 crates/auto_update2/src/auto_update.rs | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
index 35d640cb81..de5eadb61a 100644
--- a/.github/actions/run_tests/action.yml
+++ b/.github/actions/run_tests/action.yml
@@ -25,10 +25,10 @@ runs:
       env:
         RUSTFLAGS: -D warnings
       shell: bash -euxo pipefail {0}
-      run: echo cargo check --tests --workspace
+      run: cargo check --tests --workspace
 
     - name: Run tests
       env:
         RUSTFLAGS: -D warnings
       shell: bash -euxo pipefail {0}
-      run: echo cargo nextest run --workspace --no-fail-fast
+      run: cargo nextest run --workspace --no-fail-fast
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index daf1dc3aee..447e928866 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -92,7 +92,7 @@ jobs:
         run: script/generate-licenses
 
       - name: Create app bundle
-        run: script/bundle -2d
+        run: script/bundle -2
 
       - name: Upload Zed Nightly
         run: script/upload-nightly
diff --git a/crates/auto_update2/src/auto_update.rs b/crates/auto_update2/src/auto_update.rs
index 273d877967..06b4e45066 100644
--- a/crates/auto_update2/src/auto_update.rs
+++ b/crates/auto_update2/src/auto_update.rs
@@ -78,6 +78,11 @@ impl Settings for AutoUpdateSetting {
 pub fn init(http_client: Arc<dyn HttpClient>, server_url: String, cx: &mut AppContext) {
     AutoUpdateSetting::register(cx);
 
+    cx.observe_new_views(|wokrspace: &mut Workspace, _cx| {
+        wokrspace.register_action(|_, action: &Check, cx| check(action, cx));
+    })
+    .detach();
+
     if let Some(version) = *ZED_APP_VERSION {
         let auto_updater = cx.build_model(|cx| {
             let updater = AutoUpdater::new(version, http_client, server_url);
@@ -101,7 +106,6 @@ pub fn init(http_client: Arc<dyn HttpClient>, server_url: String, cx: &mut AppCo
         });
         cx.set_global(Some(auto_updater));
         //todo!(action)
-        // cx.add_global_action(check);
         // cx.add_global_action(view_release_notes);
         // cx.add_action(UpdateNotification::dismiss);
     }