Skip to content

Commit

Permalink
Fix extension tests on release branches (#20307)
Browse files Browse the repository at this point in the history
Co-Authored-By: Max <max@zed.dev>
cc @maxdeviant

Release Notes:

- N/A

---------

Co-authored-by: Max <max@zed.dev>
  • Loading branch information
ConradIrwin and maxbrunsfeld authored Nov 8, 2024
1 parent 6ad8c4a commit 8cc3ce1
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
3 changes: 3 additions & 0 deletions crates/extension_host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ workspace = true
path = "src/extension_host.rs"
doctest = false

[features]
test-support = []

[dependencies]
anyhow.workspace = true
async-compression.workspace = true
Expand Down
21 changes: 14 additions & 7 deletions crates/extension_host/src/wasm_host/wit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,20 @@ impl Extension {
version: SemanticVersion,
component: &Component,
) -> Result<Self> {
// Note: The release channel can be used to stage a new version of the extension API.
let allow_latest_version = match release_channel {
ReleaseChannel::Dev | ReleaseChannel::Nightly => true,
ReleaseChannel::Stable | ReleaseChannel::Preview => false,
};

if allow_latest_version && version >= latest::MIN_VERSION {
if version >= latest::MIN_VERSION {
// Note: The release channel can be used to stage a new version of the extension API.
// We always allow the latest in tests so that the extension tests pass on release branches.
let allow_latest_version = match release_channel {
ReleaseChannel::Dev | ReleaseChannel::Nightly => true,
ReleaseChannel::Stable | ReleaseChannel::Preview => {
cfg!(any(test, feature = "test-support"))
}
};
if !allow_latest_version {
Err(anyhow!(
"unreleased versions of the extension API can only be used on development builds of Zed"
))?;
}
let extension =
latest::Extension::instantiate_async(store, component, latest::linker())
.await
Expand Down
1 change: 1 addition & 0 deletions crates/extensions_ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ async-tar.workspace = true
ctor.workspace = true
editor = { workspace = true, features = ["test-support"] }
env_logger.workspace = true
extension_host = {workspace = true, features = ["test-support"] }
fs = { workspace = true, features = ["test-support"] }
gpui = { workspace = true, features = ["test-support"] }
http_client.workspace = true
Expand Down

0 comments on commit 8cc3ce1

Please sign in to comment.