Skip to content

Commit

Permalink
fix: Audit 01/07 (#1784)
Browse files Browse the repository at this point in the history
* Update proto.

* Redo project toolchain.

* Update repo.

* Add tests.

* fix lint.

* Polish.

* Use platform instead.
  • Loading branch information
milesj authored Jan 8, 2025
1 parent 13421b6 commit 9de43e7
Show file tree
Hide file tree
Showing 29 changed files with 341 additions and 190 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
with:
auto-install: true
cache: ${{ runner.os == 'Linux' }}
proto-version: '0.44.2' # Keep in sync
proto-version: '0.44.4' # Keep in sync
- uses: mozilla-actions/[email protected]
if: ${{ vars.ENABLE_SCCACHE == 'true' }}
- name: Checking coverage status
Expand Down
9 changes: 9 additions & 0 deletions .yarn/versions/ddd51f72.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
releases:
"@moonrepo/cli": patch
"@moonrepo/core-linux-arm64-gnu": patch
"@moonrepo/core-linux-arm64-musl": patch
"@moonrepo/core-linux-x64-gnu": patch
"@moonrepo/core-linux-x64-musl": patch
"@moonrepo/core-macos-arm64": patch
"@moonrepo/core-macos-x64": patch
"@moonrepo/core-windows-x64-msvc": patch
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## Unreleased

#### 🐞 Fixes

- Fixed `NO_COLOR` and `FORCE_COLOR` being unexpectedly set in some situations.
- Fixed an issue where a custom project `language` would no longer inherit global tasks of the same
name.

#### ⚙️ Internal

- Updated proto to [v0.44.4](https://github.com/moonrepo/proto/releases/tag/v0.44.4) (from 0.44.2).

## 1.31.0

#### 💥 Breaking
Expand Down
71 changes: 29 additions & 42 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ default-members = ["crates/cli"]

[workspace.dependencies]
async-recursion = "1.1.1"
async-trait = "0.1.84"
async-trait = "0.1.85"
cached = "0.54.0"
chrono = { version = "0.4.39", features = ["serde"] }
cd_env = "0.2.0"
ci_env = "0.3.0"
clap = { version = "4.5.23", default-features = false, features = [
clap = { version = "4.5.24", default-features = false, features = [
"std",
"error-context",
] }
clap_complete = "4.5.40"
clap_complete = "4.5.41"
compact_str = { version = "0.8.1", default-features = false, features = [
"serde",
] }
Expand Down Expand Up @@ -55,7 +55,7 @@ reqwest = { version = "0.12.12", default-features = false, features = [
] }
rustc-hash = "2.1.0"
scc = "2.2.5"
schematic = { version = "0.17.7", default-features = false, features = [
schematic = { version = "0.17.8", default-features = false, features = [
"schema",
] }
serial_test = "3.2.0"
Expand All @@ -71,7 +71,7 @@ starbase_archive = { version = "0.9.0", default-features = false, features = [
] }
starbase_events = "0.6.6"
starbase_sandbox = "0.8.0"
starbase_shell = "0.6.9"
starbase_shell = "0.6.10"
starbase_styles = { version = "0.4.4", features = ["relative-path"] }
starbase_utils = { version = "0.9.1", default-features = false, features = [
"editor-config",
Expand All @@ -95,7 +95,7 @@ uuid = { version = "1.11.0", features = ["v4"] }
# proto/plugin related
extism = "=1.9.1"
extism-pdk = "1.3.0"
proto_core = "0.44.2"
proto_core = "0.44.3"
proto_installer = "0.8.0"
system_env = "0.6.1"
version_spec = "0.7.1"
Expand Down
2 changes: 1 addition & 1 deletion crates/common/src/consts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ pub const BIN_NAME: &str = "moon";

pub const CONFIG_DIRNAME: &str = ".moon";

pub const PROTO_CLI_VERSION: &str = "0.44.2";
pub const PROTO_CLI_VERSION: &str = "0.44.4";
1 change: 0 additions & 1 deletion crates/config/src/language_platform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ impl LanguageType {
pub fn get_toolchain_ids(&self) -> Vec<Id> {
match self {
Self::Bash | Self::Batch | Self::Unknown => vec![Id::raw("system")],
Self::TypeScript => vec![Id::raw("typescript"), Id::raw("javascript")],
Self::Other(id) => vec![id.to_owned(), Id::raw("system")],
other => vec![Id::raw(other.to_string().to_lowercase())],
}
Expand Down
2 changes: 2 additions & 0 deletions crates/config/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::disallowed_types)] // schematic

#[cfg(feature = "loader")]
mod config_cache;
mod config_finder;
Expand Down
Loading

0 comments on commit 9de43e7

Please sign in to comment.