From 3bfab4daa10fb6c07fe7bfa2847e53df47dfaec0 Mon Sep 17 00:00:00 2001 From: Alpha Chen Date: Wed, 17 Dec 2025 14:46:04 -0800 Subject: [PATCH] chore: update to dist 0.30.3 --- .github/workflows/release.yml | 14 ++++++++---- Cargo.toml | 41 --------------------------------- dist-workspace.toml | 43 +++++++++++++++++++++++++++++++++++ scope/Cargo.toml | 3 ++- 4 files changed, 55 insertions(+), 46 deletions(-) create mode 100644 dist-workspace.toml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cedbca9b..630a297a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -# This file was autogenerated by dist: https://opensource.axo.dev/cargo-dist/ +# This file was autogenerated by dist: https://axodotdev.github.io/cargo-dist # # Copyright 2022-2024, axodotdev # SPDX-License-Identifier: MIT or Apache-2.0 @@ -58,12 +58,13 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false submodules: recursive - name: Install dist # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.28.0/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.3/cargo-dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: @@ -117,6 +118,7 @@ jobs: git config --global core.longpaths true - uses: actions/checkout@v4 with: + persist-credentials: false submodules: recursive - name: Install Rust non-interactively if not already installed if: ${{ matrix.container }} @@ -185,6 +187,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false submodules: recursive - name: Install cached dist uses: actions/download-artifact@v4 @@ -236,8 +239,8 @@ jobs: - custom-build-linux-arm - build-global-artifacts - custom-build-linux-pkgs - # Only run if we're "publishing", and only if local and global didn't fail (skipped is fine) - if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-linux-pkgs.result == 'skipped' || needs.custom-build-linux-pkgs.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') && (needs.custom-build-linux-arm.result == 'skipped' || needs.custom-build-linux-arm.result == 'success') }} + # Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine) + if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-linux-pkgs.result == 'skipped' || needs.custom-build-linux-pkgs.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') && (needs.custom-build-linux-arm.result == 'skipped' || needs.custom-build-linux-arm.result == 'success') }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} runs-on: "ubuntu-latest" @@ -246,6 +249,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false submodules: recursive - name: Install cached dist uses: actions/download-artifact@v4 @@ -310,6 +314,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: true repository: "oscope-dev/homebrew-formulas" token: ${{ secrets.HOMEBREW_TAP_TOKEN }} # So we have access to the formula @@ -356,6 +361,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false submodules: recursive custom-dotslash: diff --git a/Cargo.toml b/Cargo.toml index 4914f1f1..851f5de2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,52 +2,11 @@ members = ["scope"] resolver = "2" -# Config for 'dist' -[workspace.metadata.dist] -# The preferred dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.28.0" -# CI backends to support -ci = "github" -# The installers to generate for each app -installers = ["shell", "homebrew"] -# A GitHub repo to push Homebrew formulas to -tap = "oscope-dev/homebrew-formulas" -# Target platforms to build apps for (Rust target-triple syntax) -targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl"] -# Global artifacts jobs to run in CI -global-artifacts-jobs = ["./build-linux-pkgs"] -# Publish jobs to run in CI -publish-jobs = ["homebrew"] -# Which actions to run on pull requests -pr-run-mode = "plan" -# Whether to publish prereleases to package managers -publish-prereleases = true -# Post-announce jobs to run in CI -post-announce-jobs = ["./dotslash"] -# Local artifacts jobs to run in CI -local-artifacts-jobs = ["./build-linux-arm"] -# Path that installers should place binaries in -install-path = "CARGO_HOME" -# Whether to install an updater program -install-updater = false - # The profile that 'cargo dist' will build with [profile.dist] inherits = "release" lto = "thin" -[workspace.metadata.dist.github-custom-runners] -global = "ubuntu-latest" - -[workspace.metadata.dist.github-custom-runners.x86_64-unknown-linux-gnu] -runner = "ubuntu-latest" - -[workspace.metadata.dist.github-custom-runners.x86_64-unknown-linux-musl] -runner = "ubuntu-latest" - -[workspace.metadata.dist.github-custom-runners.aarch64-apple-darwin] -runner = "macos-latest" - [workspace.dependencies] clap = { version = "4.5.8", features = ["derive", "env"]} human-panic = "2.0.2" diff --git a/dist-workspace.toml b/dist-workspace.toml new file mode 100644 index 00000000..14dbf16f --- /dev/null +++ b/dist-workspace.toml @@ -0,0 +1,43 @@ +[workspace] +members = ["cargo:."] + +# Config for 'dist' +[dist] +# The preferred dist version to use in CI (Cargo.toml SemVer syntax) +cargo-dist-version = "0.30.3" +# CI backends to support +ci = "github" +# The installers to generate for each app +installers = ["shell", "homebrew"] +# A GitHub repo to push Homebrew formulas to +tap = "oscope-dev/homebrew-formulas" +# Target platforms to build apps for (Rust target-triple syntax) +targets = ["aarch64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl"] +# Global artifacts jobs to run in CI +global-artifacts-jobs = ["./build-linux-pkgs"] +# Publish jobs to run in CI +publish-jobs = ["homebrew"] +# Which actions to run on pull requests +pr-run-mode = "plan" +# Whether to publish prereleases to package managers +publish-prereleases = true +# Post-announce jobs to run in CI +post-announce-jobs = ["./dotslash"] +# Local artifacts jobs to run in CI +local-artifacts-jobs = ["./build-linux-arm"] +# Path that installers should place binaries in +install-path = "CARGO_HOME" +# Whether to install an updater program +install-updater = false + +[dist.github-custom-runners] +global = "ubuntu-latest" + +[dist.github-custom-runners.x86_64-unknown-linux-gnu] +runner = "ubuntu-latest" + +[dist.github-custom-runners.x86_64-unknown-linux-musl] +runner = "ubuntu-latest" + +[dist.github-custom-runners.aarch64-apple-darwin] +runner = "macos-latest" diff --git a/scope/Cargo.toml b/scope/Cargo.toml index 0b16e671..df6dce0a 100644 --- a/scope/Cargo.toml +++ b/scope/Cargo.toml @@ -3,7 +3,8 @@ name = "dev-scope" version = "2024.2.94" edition = "2024" default-run = "scope" -repository = "https://github.com/oscope-dev/scope" +repository = "https://github.com/oscope-dev/scope" +homepage = "https://oscope-dev.github.io/scope/" license = "BSD-3-Clause" keywords = ["local-dev"] categories = ["command-line-utilities", "development-tools::debugging", "development-tools::build-utils"]