feat: added --bump option for outdated/upgrade (#2667)

jdx · Sep 27, 2024 · 47719be · 47719be
1 parent 23e5ee2
commit 47719be
Show file tree

Hide file tree

Showing 59 changed files with 474 additions and 325 deletions.
diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml
@@ -17,6 +17,7 @@ concurrency:
 
 env:
   MISE_EXPERIMENTAL: 1
+  NPM_CONFIG_FUND: false
 
 jobs:
   release-plz:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,11 +20,6 @@ jobs:
     runs-on: ${{matrix.runs-on}}
     timeout-minutes: 45
     env:
-      #RUSTC_WRAPPER: sccache
-      SCCACHE_ENDPOINT: minio.jdx.dev
-      SCCACHE_BUCKET: sccache
-      SCCACHE_REGION: auto
-      SCCACHE_S3_NO_CREDENTIALS: ${{ secrets.MINIO_AWS_ACCESS_KEY_ID && '0' || '1' }}
       MINIO_AWS_ACCESS_KEY_ID: ${{ secrets.MINIO_AWS_ACCESS_KEY_ID }}
       MINIO_AWS_SECRET_ACCESS_KEY: ${{ secrets.MINIO_AWS_SECRET_ACCESS_KEY }}
     strategy:
@@ -74,11 +69,6 @@ jobs:
           p12-file-base64: ${{ secrets.APPLE_DEVELOPER_ID_APPLICATION_CERTS_P12 }}
           p12-password: ${{ secrets.APPLE_DEVELOPER_ID_APPLICATION_CERTS_P12_PASS }}
       - uses: actions/checkout@v4
-      - if: ${{ env.SCCACHE_S3_NO_CREDENTIALS == '0' }}
-        run: |
-          echo "AWS_ACCESS_KEY_ID=$MINIO_AWS_ACCESS_KEY_ID" >> "$GITHUB_ENV"
-          echo "AWS_SECRET_ACCESS_KEY=$MINIO_AWS_SECRET_ACCESS_KEY" >> "$GITHUB_ENV"
-      - uses: mozilla-actions/[email protected]
       - name: cache crates
         id: cache-crates
         uses: actions/cache@v4
@@ -109,19 +99,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - if: steps.cache-crates.outputs.cache-hit != 'true'
         run: cargo cache --autoclean
-      - run: ${SCCACHE_PATH} --show-stats
   build-tarball-windows:
     name: build-tarball-windows-${{matrix.arch}}
     runs-on: windows-latest
     timeout-minutes: 45
-    env:
-      #RUSTC_WRAPPER: sccache
-      SCCACHE_ENDPOINT: minio.jdx.dev
-      SCCACHE_BUCKET: sccache
-      SCCACHE_REGION: auto
-      SCCACHE_S3_NO_CREDENTIALS: ${{ secrets.MINIO_AWS_ACCESS_KEY_ID && '0' || '1' }}
-      AWS_ACCESS_KEY_ID: ${{ secrets.MINIO_AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.MINIO_AWS_SECRET_ACCESS_KEY }}
     strategy:
       fail-fast: false
       matrix:
@@ -133,7 +114,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: rustup target add ${{matrix.target}}
-      - uses: mozilla-actions/[email protected]
       - name: cache crates
         id: cache-crates
         uses: actions/cache@v4

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,14 +17,8 @@ env:
   MISE_TRUSTED_CONFIG_PATHS: ${{ github.workspace }}
   MISE_EXPERIMENTAL: 1
   RUST_BACKTRACE: 1
-  #RUSTC_WRAPPER: sccache
-  SCCACHE_ENDPOINT: minio.jdx.dev
-  SCCACHE_BUCKET: sccache
-  SCCACHE_REGION: auto
-  SCCACHE_S3_NO_CREDENTIALS: ${{ secrets.MINIO_AWS_ACCESS_KEY_ID && '0' || '1' }}
-  MINIO_AWS_ACCESS_KEY_ID: ${{ secrets.MINIO_AWS_ACCESS_KEY_ID }}
-  MINIO_AWS_SECRET_ACCESS_KEY: ${{ secrets.MINIO_AWS_SECRET_ACCESS_KEY }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  NPM_CONFIG_FUND: false
 
 permissions:
   pull-requests: write
@@ -87,11 +81,6 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.event.pull_request.head.ref }}
           token: ${{ secrets.RTX_GITHUB_BOT_TOKEN || github.token }}
-      - if: ${{ env.SCCACHE_S3_NO_CREDENTIALS == '0' }}
-        run: |
-          echo "AWS_ACCESS_KEY_ID=$MINIO_AWS_ACCESS_KEY_ID" >> "$GITHUB_ENV"
-          echo "AWS_SECRET_ACCESS_KEY=$MINIO_AWS_SECRET_ACCESS_KEY" >> "$GITHUB_ENV"
-      - uses: mozilla-actions/[email protected]
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           { toolchain: nightly, components: "rustfmt, clippy", rustflags: "" }
@@ -116,7 +105,6 @@ jobs:
           push: true
           author_name: mise[bot]
           author_email: [email protected]
-      - run: ${SCCACHE_PATH} --show-stats
 
   coverage:
     name: coverage-${{matrix.tranche}}
@@ -131,11 +119,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - if: ${{ env.SCCACHE_S3_NO_CREDENTIALS == '0' }}
-        run: |
-          echo "AWS_ACCESS_KEY_ID=$MINIO_AWS_ACCESS_KEY_ID" >> "$GITHUB_ENV"
-          echo "AWS_SECRET_ACCESS_KEY=$MINIO_AWS_SECRET_ACCESS_KEY" >> "$GITHUB_ENV"
-      - uses: mozilla-actions/[email protected]
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: coverage
@@ -179,7 +162,6 @@ jobs:
           name: coverage-${{matrix.tranche}}.lcov
           path: coverage-${{matrix.tranche}}.lcov
           if-no-files-found: error
-      - run: ${SCCACHE_PATH} --show-stats
   coverage-report:
     name: coverage-report
     runs-on: ubuntu-latest

diff --git a/Cross.toml b/Cross.toml
@@ -1,26 +1,5 @@
-target.x86_64-unknown-linux-gnu.pre-build = "./scripts/sccache.sh"
-target.x86_64-unknown-linux-musl.pre-build = "./scripts/sccache.sh"
-#target.aarch64-unknown-linux-gnu.pre-build = "./scripts/sccache.sh"
-#target.aarch64-unknown-linux-musl.pre-build = "./scripts/sccache.sh"
-#target.armv7-unknown-linux-gnueabihf.pre-build = "./scripts/sccache.sh"
-#target.armv7-unknown-linux-musleabihf.pre-build = "./scripts/sccache.sh"
-#target.arm-unknown-linux-gnueabi.pre-build = "./scripts/sccache.sh"
-#target.arm-unknown-linux-musleabi.pre-build = "./scripts/sccache.sh"
-#target.x86_64-apple-darwin.pre-build = "./scripts/sccache.sh"
-#target.aarch64-apple-darwin.pre-build = "./scripts/sccache.sh"
-#target.aarch64-pc-windows-msvc.pre-build = "./scripts/sccache.sh"
-#target.x86_64-pc-windows-msvc.pre-build = "./scripts/sccache.sh"
-
 [build.env]
 passthrough = [
     "AWS_ACCESS_KEY_ID",
     "AWS_SECRET_ACCESS_KEY",
-    "RUSTC_WRAPPER",
-    "SCCACHE_BUCKET",
-    "SCCACHE_DIR",
-    "SCCACHE_ENDPOINT",
-    "SCCACHE_ERROR_LOG",
-    "SCCACHE_LOG",
-    "SCCACHE_REGION",
-    "SCCACHE_S3_NO_CREDENTIALS",
 ]
diff --git a/docs/cli/index.md b/docs/cli/index.md
@@ -792,9 +792,20 @@ Arguments:
           If not specified, all tools in global and local configs will be shown
 
 Options:
+  -l, --bump
+          Compares against the latest versions available, not what matches the current config
+
+          For example, if you have `node = "20"` in your config by default `mise outdated` will only
+          show other 20.x versions, not 21.x or 22.x versions.
+
+          Using this flag, if there are 21.x or newer versions it will display those instead of 20.x.
+
   -J, --json
           Output in JSON format
 
+      --no-header
+          Don't show table header
+
 Examples:
 
     $ mise outdated
@@ -1763,14 +1774,23 @@ Options:
   -n, --dry-run
           Just print what would be done, don't actually do it
 
+  -i, --interactive
+          Display multiselect menu to choose which tools to upgrade
+
   -j, --jobs <JOBS>
           Number of jobs to run in parallel
           [default: 4]
 
           [env: MISE_JOBS=]
 
-  -i, --interactive
-          Display multiselect menu to choose which tools to upgrade
+  -l, --bump
+          Upgrades to the latest version available, bumping the version in mise.toml
+
+          For example, if you have `node = "20.0.0"` in your mise.toml but 22.1.0 is the latest available,
+          this will install 22.1.0 and set `node = "22.1.0"` in your config.
+
+          It keeps the same precision as what was there before, so if you instead had `node = "20"`, it
+          would change your config to `node = "22"`.
 
       --raw
           Directly pipe stdin/stdout/stderr from plugin to user Sets --jobs=1

diff --git a/docs/cli/outdated.md b/docs/cli/outdated.md
@@ -12,9 +12,20 @@ Arguments:
           If not specified, all tools in global and local configs will be shown
 
 Options:
+  -l, --bump
+          Compares against the latest versions available, not what matches the current config
+          
+          For example, if you have `node = "20"` in your config by default `mise outdated` will only
+          show other 20.x versions, not 21.x or 22.x versions.
+          
+          Using this flag, if there are 21.x or newer versions it will display those instead of 20.x.
+
   -J, --json
           Output in JSON format
 
+      --no-header
+          Don't show table header
+
 Examples:
 
     $ mise outdated

diff --git a/docs/cli/upgrade.md b/docs/cli/upgrade.md
@@ -17,14 +17,23 @@ Options:
   -n, --dry-run
           Just print what would be done, don't actually do it
 
+  -i, --interactive
+          Display multiselect menu to choose which tools to upgrade
+
   -j, --jobs <JOBS>
           Number of jobs to run in parallel
           [default: 4]
           
           [env: MISE_JOBS=]
 
-  -i, --interactive
-          Display multiselect menu to choose which tools to upgrade
+  -l, --bump
+          Upgrades to the latest version available, bumping the version in mise.toml
+          
+          For example, if you have `node = "20.0.0"` in your mise.toml but 22.1.0 is the latest available,
+          this will install 22.1.0 and set `node = "22.1.0"` in your config.
+          
+          It keeps the same precision as what was there before, so if you instead had `node = "20"`, it
+          would change your config to `node = "22"`.
 
       --raw
           Directly pipe stdin/stdout/stderr from plugin to user Sets --jobs=1

diff --git a/e2e/cli/test_upgrade b/e2e/cli/test_upgrade
@@ -10,3 +10,7 @@ mise upgrade dummy
 
 assert_contains "mise ls --installed dummy" "1.1.0"
 assert_not_contains "mise ls --installed dummy" "1.0.0"
+
+mise upgrade dummy --bump
+assert_contains "mise ls --installed dummy" "2.0.0"
+assert_not_contains "mise ls --installed dummy" "1.1.0"
diff --git a/e2e/plugins/test_tiny b/e2e/plugins/test_tiny
@@ -29,8 +29,7 @@ rm -rf "$MISE_DATA_DIR/installs/tiny"
 mise use tiny@3
 mv "$MISE_DATA_DIR/installs/tiny/"{3.1.0,3.0.0}
 assert "mise current tiny" "3.0.0"
-assert "mise outdated tiny" "Tool    Requested  Current  Latest
-tiny    3          3.0.0    3.1.0"
+assert "mise outdated tiny" "tiny  3  3.0.0  3.1.0 ~/workdir/.mise.toml"
 mise upgrade tiny
 assert "mise current tiny" "3.1.0"
 assert "mise outdated tiny" ""
diff --git a/mise.usage.kdl b/mise.usage.kdl
@@ -627,7 +627,11 @@ cmd "outdated" help="Shows outdated tool versions" {
     $ mise outdated --json
     {"python": {"requested": "3.11", "current": "3.11.0", "latest": "3.11.1"}, ...}
 "#
+    flag "-l --bump" help="Compares against the latest versions available, not what matches the current config" {
+        long_help "Compares against the latest versions available, not what matches the current config\n\nFor example, if you have `node = \"20\"` in your config by default `mise outdated` will only\nshow other 20.x versions, not 21.x or 22.x versions.\n\nUsing this flag, if there are 21.x or newer versions it will display those instead of 20.x."
+    }
     flag "-J --json" help="Output in JSON format"
+    flag "--no-header" help="Don't show table header"
     arg "[TOOL@VERSION]..." help="Tool(s) to show outdated versions for\ne.g.: node@20 [email protected]\nIf not specified, all tools in global and local configs will be shown" var=true
 }
 cmd "plugins" help="Manage plugins" {
@@ -1222,10 +1226,13 @@ By default this command modifies ".mise.toml" in the current directory."#
 cmd "upgrade" help="Upgrades outdated tool versions" {
     alias "up"
     flag "-n --dry-run" help="Just print what would be done, don't actually do it"
+    flag "-i --interactive" help="Display multiselect menu to choose which tools to upgrade"
     flag "-j --jobs" help="Number of jobs to run in parallel\n[default: 4]" {
         arg "<JOBS>"
     }
-    flag "-i --interactive" help="Display multiselect menu to choose which tools to upgrade"
+    flag "-l --bump" help="Upgrades to the latest version available, bumping the version in mise.toml" {
+        long_help "Upgrades to the latest version available, bumping the version in mise.toml\n\nFor example, if you have `node = \"20.0.0\"` in your mise.toml but 22.1.0 is the latest available,\nthis will install 22.1.0 and set `node = \"22.1.0\"` in your config.\n\nIt keeps the same precision as what was there before, so if you instead had `node = \"20\"`, it\nwould change your config to `node = \"22\"`."
+    }
     flag "--raw" help="Directly pipe stdin/stdout/stderr from plugin to user Sets --jobs=1"
     arg "[TOOL@VERSION]..." help="Tool(s) to upgrade\ne.g.: node@20 [email protected]\nIf not specified, all current tools will be upgraded" var=true
 }

diff --git a/scripts/build-tarball.sh b/scripts/build-tarball.sh
@@ -92,7 +92,7 @@ fi
 cd dist
 
 if [[ "$os" == "macos" ]]; then
-  codesign -f -s "Developer ID Application: Jeffrey Dickey (4993Y37DX6)" mise/bin/mise
+  codesign -f -p dev.jdx. -s "Developer ID Application: Jeffrey Dickey (4993Y37DX6)" mise/bin/mise
 fi
 
 if [[ "$os" == "windows" ]]; then

diff --git a/scripts/sccache.sh b/scripts/sccache.sh
diff --git a/src/backend/mod.rs b/src/backend/mod.rs
@@ -17,6 +17,7 @@ use versions::Versioning;
 use self::backend_meta::BackendMeta;
 use crate::cli::args::{BackendArg, ToolVersionType};
 use crate::cmd::CmdLineRunner;
+use crate::config::settings::SETTINGS;
 use crate::config::{Config, Settings, CONFIG};
 use crate::file::{display_path, remove_all, remove_all_with_warning};
 use crate::install_context::InstallContext;
@@ -364,7 +365,6 @@ pub trait Backend: Debug + Send + Sync {
             plugin.is_installed_err()?;
         }
         let config = Config::get();
-        let settings = Settings::try_get()?;
         if self.is_version_installed(&ctx.tv, true) {
             if ctx.force {
                 self.uninstall_version(&ctx.tv, ctx.pr.as_ref(), false)?;
@@ -377,13 +377,13 @@ pub trait Backend: Debug + Send + Sync {
         self.create_install_dirs(&ctx.tv)?;
 
         if let Err(e) = self.install_version_impl(&ctx) {
-            self.cleanup_install_dirs_on_error(&settings, &ctx.tv);
+            self.cleanup_install_dirs_on_error(&SETTINGS, &ctx.tv);
             return Err(e);
         }
 
         BackendMeta::write(&ctx.tv.backend)?;
 
-        self.cleanup_install_dirs(&settings, &ctx.tv);
+        self.cleanup_install_dirs(&SETTINGS, &ctx.tv);
         // attempt to touch all the .tool-version files to trigger updates in hook-env
         let mut touch_dirs = vec![dirs::DATA.to_path_buf()];
         touch_dirs.extend(config.config_files.keys().cloned());