Skip to content

Commit

Permalink
Update changelog.
Browse files Browse the repository at this point in the history
  • Loading branch information
milesj committed Nov 14, 2023
1 parent c029ef5 commit 3655639
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

#### Updates

- Added a `detect-strategy` setting to `~/.proto/config.toml` to configure which strategy to use when detecting a version. Accepts:
- `first-available` (default) - Will use the first available version that is found. Either from `.prototools` or a tool specific file (`.nvmrc`, etc).
- `prefer-prototools` - Prefer a `.prototools` version, even if found in a parent directory. If none found, falls back to tool specific file.
- Added support to plugins to ignore certain paths when detecting a version.
- WASM API
- Added `DetectVersionOutput.ignore` field.
Expand Down
4 changes: 2 additions & 2 deletions crates/core/src/version_detector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub async fn detect_version_first_available(
start_dir: &Path,
end_dir: &Path,
) -> miette::Result<Option<UnresolvedVersionSpec>> {
let mut current_dir: Option<&Path> = Some(&start_dir);
let mut current_dir: Option<&Path> = Some(start_dir);

while let Some(dir) = current_dir {
trace!(
Expand Down Expand Up @@ -61,7 +61,7 @@ pub async fn detect_version_prefer_prototools(
let mut config_version = None;
let mut config_path = None;
let mut ecosystem_version = None;
let mut current_dir: Option<&Path> = Some(&start_dir);
let mut current_dir: Option<&Path> = Some(start_dir);

while let Some(dir) = current_dir {
trace!(
Expand Down

0 comments on commit 3655639

Please sign in to comment.