From 464a4439f7c71e867da481e99e22ad99cc23807e Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 1 Jul 2024 14:28:27 -0400 Subject: [PATCH] zig: Temporarily roll back changes depending on new extension API (#13709) This PR temporarily rolls back the changes in #12173 so that we can publish a new version of the Zig extension. There was a problem stemming from #12614 that caused v0.1.2 of the Zig extension to get re-published with unreleased `zed_extension_api` changes. Once we publish v0.1.3 we'll be able to revert this change. Release Notes: - N/A --- Cargo.lock | 2 +- extensions/zig/Cargo.toml | 2 +- extensions/zig/src/zig.rs | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4e29aa2666c50777a0eaf1c972935e072a4f0620..66226f419e5bdd4e462e99b4bcb9f540be8ffb51 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13891,7 +13891,7 @@ dependencies = [ name = "zed_zig" version = "0.1.2" dependencies = [ - "zed_extension_api 0.0.7", + "zed_extension_api 0.0.6", ] [[package]] diff --git a/extensions/zig/Cargo.toml b/extensions/zig/Cargo.toml index 5ddd06f10614098ac558da8f45827c4be18e5b8f..89714bf450d9f2498e1b9f84c99b2911b0b8534d 100644 --- a/extensions/zig/Cargo.toml +++ b/extensions/zig/Cargo.toml @@ -13,4 +13,4 @@ path = "src/zig.rs" crate-type = ["cdylib"] [dependencies] -zed_extension_api = { path = "../../crates/extension_api" } +zed_extension_api = "0.0.6" diff --git a/extensions/zig/src/zig.rs b/extensions/zig/src/zig.rs index a42d62be29a2d61014707f93a08a49ee4564e622..2eb1db9eef3aff321aa93804a5813997e5bd752c 100644 --- a/extensions/zig/src/zig.rs +++ b/extensions/zig/src/zig.rs @@ -43,7 +43,15 @@ impl ZigExtension { // them, at time of writing. // // ZLS tracking issue: https://github.com/zigtools/zls/issues/1879 - let release = zed::github_release_by_tag_name("zigtools/zls", "0.11.0")?; + // let release = zed::github_release_by_tag_name("zigtools/zls", "0.11.0")?; + + let release = zed::latest_github_release( + "zigtools/zls", + zed::GithubReleaseOptions { + require_assets: true, + pre_release: false, + }, + )?; let (platform, arch) = zed::current_platform(); let asset_name = format!(