diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 127a38ad572..7dee6594a53 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -28,7 +28,7 @@ jobs: const response = await github.request(context.payload.issue.pull_request.url); return response.data.head.sha; - name: Checkout PR branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: false ref: ${{ steps.sha.outputs.result }} @@ -42,7 +42,7 @@ jobs: # Run on base branch to get a baseline - name: Checkout base branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: clean: false ref: ${{ github.event.pull_request.base.sha }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 98af701bbce..9bf9d8d41c3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -8,7 +8,7 @@ jobs: name: Deploy runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: cache: yarn diff --git a/.github/workflows/moon.yml b/.github/workflows/moon.yml index e27a181743f..d9603fae5e2 100644 --- a/.github/workflows/moon.yml +++ b/.github/workflows/moon.yml @@ -24,7 +24,7 @@ jobs: os: [ubuntu-latest, windows-latest] node-version: [16, 18, 20] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: actions/setup-node@v3 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 304cd7585ad..c9b200ce4fe 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -9,7 +9,7 @@ jobs: name: Version check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: actions/setup-node@v3 @@ -24,7 +24,7 @@ jobs: name: CLI binary check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: bash ./scripts/checks/cliBinary.sh shell: bash installer: @@ -35,7 +35,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Unix - run: bash ./website/static/install/moon.sh if: ${{ runner.os != 'Windows' }} diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml index de3f883717a..f8803f81f29 100644 --- a/.github/workflows/release-npm.yml +++ b/.github/workflows/release-npm.yml @@ -9,7 +9,7 @@ jobs: env: NPM_CHANNEL: latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: cache: yarn diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d10bc382636..56bb36af859 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,7 +71,7 @@ jobs: name: Stable - ${{ matrix.target }} runs-on: ${{ matrix.host }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: moonrepo/setup-rust@v1 if: ${{ !matrix.docker-target }} with: @@ -143,7 +143,7 @@ jobs: name: Test - ${{ matrix.target }} runs-on: ${{ matrix.host }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: cache: yarn @@ -184,7 +184,7 @@ jobs: env: NPM_CHANNEL: latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: cache: yarn @@ -221,7 +221,7 @@ jobs: env: NPM_CHANNEL: latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: cache: yarn diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d8d81e1e8fd..2a8a546552f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -24,7 +24,7 @@ jobs: name: Format runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: moonrepo/setup-rust@v1 with: components: rustfmt @@ -38,7 +38,7 @@ jobs: os: [ubuntu-latest, windows-latest] fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: moonrepo/setup-rust@v1 with: bins: cargo-make @@ -53,7 +53,7 @@ jobs: os: [buildjet-4vcpu-ubuntu-2204, self-hosted-laptop-macos-m1, self-hosted-laptop-windows-i7] fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: moonrepo/setup-rust@v1 with: bins: cargo-make, cargo-nextest, cargo-llvm-cov @@ -86,7 +86,7 @@ jobs: needs: - test steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 name: Download coverage reports with: diff --git a/Cargo.lock b/Cargo.lock index 37d24b19d3f..d56791f7dac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5577,9 +5577,9 @@ dependencies = [ [[package]] name = "starbase_utils" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "032493983d1aaa0e6107219e8b17e2b315452f902f0f512c8bd5af6df6704b44" +checksum = "9e1665a9066fd0da6e608166a18dba7324734229b5554f6abff7b6a2761b5402" dependencies = [ "dirs 5.0.1", "ec4rs", @@ -5595,7 +5595,7 @@ dependencies = [ "starbase_styles", "thiserror", "tokio", - "toml 0.7.6", + "toml 0.8.0", "tracing", "wax", ] @@ -6015,7 +6015,19 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.14", +] + +[[package]] +name = "toml" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.0", ] [[package]] @@ -6040,6 +6052,19 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" version = "0.3.2" diff --git a/Cargo.toml b/Cargo.toml index 0ce64b47580..03b97338629 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,7 @@ starbase_archive = { version = "0.2.2", default-features = false, features = [ starbase_events = { version = "0.2.1" } starbase_sandbox = "0.1.10" starbase_styles = { version = "0.1.15", features = ["relative-path"] } -starbase_utils = { version = "0.3.1", default-features = false, features = [ +starbase_utils = { version = "0.3.2", default-features = false, features = [ "editor-config", "glob", "json", diff --git a/crates/cli/src/commands/ci.rs b/crates/cli/src/commands/ci.rs index e14235fcdc3..1e92c190c44 100644 --- a/crates/cli/src/commands/ci.rs +++ b/crates/cli/src/commands/ci.rs @@ -104,7 +104,7 @@ fn gather_runnable_targets( } else { debug!( "Not running target {} because it either has no `outputs` or `runInCI` is false", - color::label(&task.target.id), + color::label(&task.target), ); } } diff --git a/crates/cli/src/commands/query.rs b/crates/cli/src/commands/query.rs index 5028d0418c1..9d959317c55 100644 --- a/crates/cli/src/commands/query.rs +++ b/crates/cli/src/commands/query.rs @@ -32,7 +32,7 @@ pub async fn hash(args: ArgsRef, workspace: ResourceRef, workspace: ResourceMut< term.line(serde_json::to_string_pretty(&result).into_diagnostic()?)?; } else { - term.line(format!("Left: {}", color::id(&result.left_hash)))?; - term.line(format!("Right: {}\n", color::id(&result.right_hash)))?; + term.line(format!("Left: {}", color::hash(&result.left_hash)))?; + term.line(format!("Right: {}\n", color::hash(&result.right_hash)))?; for diff in diff::lines(&result.left, &result.right) { match diff { diff --git a/crates/cli/src/commands/syncs/hooks.rs b/crates/cli/src/commands/syncs/hooks.rs index eb56676742d..5953cb37e59 100644 --- a/crates/cli/src/commands/syncs/hooks.rs +++ b/crates/cli/src/commands/syncs/hooks.rs @@ -19,7 +19,7 @@ pub async fn sync(args: ArgsRef, workspace: ResourceRef) { println!( "{} There's a new version of moon available, {} (currently on {})!", prefix, - color::success(latest.current_version), + color::hash(latest.current_version), current_version, ); diff --git a/crates/core/action-pipeline/src/actions/sync_workspace.rs b/crates/core/action-pipeline/src/actions/sync_workspace.rs index 6031de059a8..fef41499c47 100644 --- a/crates/core/action-pipeline/src/actions/sync_workspace.rs +++ b/crates/core/action-pipeline/src/actions/sync_workspace.rs @@ -32,7 +32,7 @@ pub async fn sync_workspace( debug!( target: LOG_TARGET, "Syncing code owners ({} enabled)", - color::id("codeowners.syncOnRun"), + color::property("codeowners.syncOnRun"), ); sync_codeowners(&workspace, &project_graph, false).await?; @@ -43,7 +43,7 @@ pub async fn sync_workspace( target: LOG_TARGET, "Syncing {} hooks ({} enabled)", workspace.config.vcs.manager, - color::id("vcs.syncHooks"), + color::property("vcs.syncHooks"), ); sync_vcs_hooks(&workspace, false).await?; diff --git a/crates/core/dep-graph/src/dep_builder.rs b/crates/core/dep-graph/src/dep_builder.rs index 0a24d1123ed..dde14612ae9 100644 --- a/crates/core/dep-graph/src/dep_builder.rs +++ b/crates/core/dep-graph/src/dep_builder.rs @@ -189,7 +189,7 @@ impl<'ws> DepGraphBuilder<'ws> { trace!( target: LOG_TARGET, "Adding dependents to run for target {}", - color::label(&target.id), + color::label(target), ); if let TargetScope::Project(project_id) = &target.scope { @@ -313,7 +313,7 @@ impl<'ws> DepGraphBuilder<'ws> { trace!( target: LOG_TARGET, "Target {} not affected based on touched files, skipping", - color::label(&target.id), + color::label(target), ); return Ok(None); diff --git a/crates/rust/platform/src/rust_platform.rs b/crates/rust/platform/src/rust_platform.rs index 9979a14b87c..2058e58bfde 100644 --- a/crates/rust/platform/src/rust_platform.rs +++ b/crates/rust/platform/src/rust_platform.rs @@ -329,7 +329,7 @@ impl Platform for RustPlatform { target: LOG_TARGET, "Syncing {} configuration file with version {}", color::file(RUSTUP.version_file), - color::symbol(&version), + color::hash(&version), ); cfg.toolchain.channel = Some(version); diff --git a/nextgen/project-expander/src/tasks_expander.rs b/nextgen/project-expander/src/tasks_expander.rs index 739c38b1534..e85461a0502 100644 --- a/nextgen/project-expander/src/tasks_expander.rs +++ b/nextgen/project-expander/src/tasks_expander.rs @@ -244,7 +244,7 @@ impl<'graph, 'query> TasksExpander<'graph, 'query> { target = task.target.as_str(), env_file = ?env_path, "Setting {} is enabled but file doesn't exist, skipping as this may be intentional", - color::symbol("options.envFile"), + color::property("options.envFile"), ); } } diff --git a/website/blog/2023-02-27_v0.25.mdx b/website/blog/2023-02-27_v0.25.mdx index a1049a11904..df34993e685 100644 --- a/website/blog/2023-02-27_v0.25.mdx +++ b/website/blog/2023-02-27_v0.25.mdx @@ -157,7 +157,7 @@ jobs: name: 'CI' runs-on: 'ubuntu-latest' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: moonrepo/setup-moon-action@v1 diff --git a/website/blog/2023-05-23_proto-v0.9.mdx b/website/blog/2023-05-23_proto-v0.9.mdx index 3b1b5a8f08e..7bad417aa3f 100644 --- a/website/blog/2023-05-23_proto-v0.9.mdx +++ b/website/blog/2023-05-23_proto-v0.9.mdx @@ -27,7 +27,7 @@ jobs: name: 'CI' runs-on: 'ubuntu-latest' steps: - - uses: 'actions/checkout@v3' + - uses: 'actions/checkout@v4' - uses: 'moonrepo/setup-proto@v0' - run: 'proto use' ``` diff --git a/website/docs/guides/ci.mdx b/website/docs/guides/ci.mdx index e85d0a4f92a..956f19857fe 100644 --- a/website/docs/guides/ci.mdx +++ b/website/docs/guides/ci.mdx @@ -75,7 +75,7 @@ jobs: name: 'CI' runs-on: 'ubuntu-latest' steps: - - uses: 'actions/checkout@v3' + - uses: 'actions/checkout@v4' with: fetch-depth: 0 - uses: 'actions/setup-node@v3' diff --git a/website/docs/guides/open-source.mdx b/website/docs/guides/open-source.mdx index 2f0a54340b1..b694a0c533f 100644 --- a/website/docs/guides/open-source.mdx +++ b/website/docs/guides/open-source.mdx @@ -32,7 +32,7 @@ jobs: node-version: [14, 16, 18] steps: # Checkout repository - - uses: 'actions/checkout@v3' + - uses: 'actions/checkout@v4' with: fetch-depth: 0 # Install Node.js so we can install dependencies diff --git a/website/docs/proto/config.mdx b/website/docs/proto/config.mdx index 808e61571db..32b12086dc4 100644 --- a/website/docs/proto/config.mdx +++ b/website/docs/proto/config.mdx @@ -117,7 +117,7 @@ jobs: name: 'CI' runs-on: 'ubuntu-latest' steps: - - uses: 'actions/checkout@v3' + - uses: 'actions/checkout@v4' - uses: 'moonrepo/setup-proto@v1' - run: 'proto use' ```