Skip to content

Commit

Permalink
chore: cargo update
Browse files Browse the repository at this point in the history
  • Loading branch information
jdx committed Mar 16, 2024
1 parent dae8ece commit e066f64
Show file tree
Hide file tree
Showing 30 changed files with 478 additions and 335 deletions.
46 changes: 46 additions & 0 deletions .github/workflows/release-plz.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: release-plz

permissions:
pull-requests: write
contents: write

on:
push:
branches:
- main
- release-plz

concurrency:
group: release-plz

jobs:
release-plz:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.MY_RELEASE_PLEASE_TOKEN }}
- uses: Swatinem/rust-cache@v2
with:
shared-key: unit
#save-if: false TODO: add this back later
cache-on-failure: true
- run: mkdir -p $HOME/bin && echo "$HOME/bin" >> "$GITHUB_PATH"
- run: |
set -euxo pipefail
cargo build --all-features
cp target/debug/mise $HOME/bin
mise trust --all
mise settings set experimental true
- uses: actions/cache@v4
with:
path: ~/.local/share/mise/{installs,plugins}
key: v0-mise-tools-${{ runner.os }}-${{ hashFiles('.mise.toml') }}
restore-keys: v0-mise-tools-${{ runner.os }}-
save-always: true
- run: mise install
- run: mise run release-plz
env:
GITHUB_TOKEN: ${{ secrets.MY_RELEASE_PLEASE_TOKEN }}
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- run: cargo build --all-features
- run: ./target/debug/mise settings set experimental true
- run: ./target/debug/mise run render
- run: ./target/debug/mise run lint:fix
- run: ./target/debug/mise run lint-fix
- run: git diff HEAD
- if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'jdx/mise'
uses: EndBug/add-and-commit@v9
Expand Down
19 changes: 10 additions & 9 deletions .mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ THIS_PROJECT = "{{config_root}}-{{cwd}}"

[tools]
#node = 'lts'
"cargo:eza" = "0.17.0"
"cargo:git-cliff" = "latest"
tiny = { version = "1", foo = "bar" }
golang = { version = "prefix:1.21", foo = "bar" }
python = { version = "latest", virtualenv = "{{env.HOME}}/.cache/venv" }
ruby = "3.1"
python = { version = "latest" }
shellcheck = "0.10"
shfmt = "3"
"npm:prettier" = "3"
"npm:markdownlint-cli" = "0.38"
#python = { version = "latest", virtualenv = "{{env.HOME}}/.cache/venv" }
#ruby = "3.1"

[plugins]
nnnn = 'https://github.com/mise-plugins/rtx-nodejs#main'
Expand All @@ -27,8 +32,8 @@ format = "cargo fmt -- --emit=files"
clean = "cargo clean"
release = "cargo release"
signal-test = "node ./test/fixtures/signal-test.js"
ci = {depends = [ "format", "build", "test" ]}
pre-commit = {depends = ["render", "lint"]}
ci = { depends = ["format", "build", "test"] }
pre-commit = { depends = ["render", "lint"] }
'test:e2e' = "just test-e2e"

[tasks.build]
Expand Down Expand Up @@ -76,10 +81,6 @@ depends = ["render:*"]
description = "Update test snapshots"
run = "cargo insta test --accept --unreferenced delete"

[tasks."lint:fix"]
alias = "lint-fix"
run = "just lint-fix"

[tasks.test]
alias = 't'
run = [
Expand Down
2 changes: 1 addition & 1 deletion .mise/config.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tasks.lint = "just lint"
tasks.l = "mise run lint"
11 changes: 11 additions & 0 deletions .mise/tasks/lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash
set -euxo pipefail

scripts=("$PWD"/scripts/*.sh "$PWD"/e2e/{test_,run_}* "$PWD"/e2e/*.sh)

cargo clippy -- -Dwarnings
cargo fmt --all -- --check
shellcheck -x "${scripts[@]}"
shfmt -d "${scripts[@]}"
prettier -c $(git ls-files '*.yml' '*.yaml')
markdownlint .
11 changes: 11 additions & 0 deletions .mise/tasks/lint-fix
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash
# mise aliases=["lint:fix"]
set -euxo pipefail

scripts=("$PWD"/scripts/*.sh "$PWD"/e2e/{test_,run_}* "$PWD"/e2e/*.sh)
cargo clippy --fix --allow-staged --allow-dirty -- -Dwarnings
cargo fmt --all
shellcheck -x "${scripts[@]}"
shfmt -w "${scripts[@]}"
prettier -w $(git ls-files '*.yml' '*.yaml')
markdownlint --fix .
31 changes: 31 additions & 0 deletions .mise/tasks/release-plz
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/usr/bin/env bash
set -euxo pipefail

version="$(git cliff --bumped-version)"
changelog="$(git cliff --unreleased)"

sed -i.bak "s/^mise [0-9]\+\.[0-9]\+\.[0-9]\+\(-rc\.[0-9]\+\)\?$/mise $version/" README.md
sed -i.bak "s/^Version: [0-9]\+\.[0-9]\+\.[0-9]\+\(-rc\.[0-9]\+\)\?$/Version: $version/" packaging/rpm/mise.spec
sed -i.bak "s/version = \"[0-9]\+\.[0-9]\+\.[0-9]\+\(-rc\.[0-9]\+\)\?\";$/version = \"$version\";/" default.nix

mise run update-shorthand-repo
mise run render ::: lint-fix

git config user.name mise-en-dev
git config user.email [email protected]
git cliff --bump -o CHANGELOG.md --verbose
git add \
CHANGELOG.md \
README.md \
default.nix \
packaging/rpm/mise.spec \
src/default_shorthands.rs \
mise.usage.kdl \
completions \
man/
git clean -df
git checkout -B release
git commit -m "Release $version"
git push origin release --force
gh pr create --title "Release $version" --body "$changelog" --label "release" ||
gh pr edit --title "Release $version" --body "$changelog"
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cat >src/default_shorthands.rs <<EOF
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// !GENERATED FILE!
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// This file is generated by scripts/update-shorthand-repo.sh
// This file is generated by .mise/tasks/update-shorthand-repo
// DO NOT EDIT THIS FILE MANUALLY. YOUR PR WILL BE REJECTED.
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// !GENERATED FILE!
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.venv
39 changes: 14 additions & 25 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ license = "MIT"
keywords = ["mise"]
categories = ["command-line-utilities"]
include = [
"src/**/*.rs",
"src/plugins/core/assets/**",
"src/assets/**",
"/completions/*",
"/Cargo.lock",
"/LICENSE",
"/README.md",
"/build.rs",
"/zipsign.pub",
"src/**/*.rs",
"src/plugins/core/assets/**",
"src/assets/**",
"/completions/*",
"/Cargo.lock",
"/LICENSE",
"/README.md",
"/build.rs",
"/zipsign.pub",
]
rust-version = "1.74.0"
build = "build.rs"
Expand Down Expand Up @@ -78,9 +78,9 @@ regex = "1.10.3"
reqwest = { version = "0.11.26", default-features = false, features = ["blocking", "json", "gzip"] }
rmp-serde = "1.1.2"
self_update = { version = "0.39.0", default-features = false, features = [
"archive-tar",
"compression-flate2",
"signatures",
"archive-tar",
"compression-flate2",
"signatures",
] }
serde = "1.0.197"
serde_derive = "1.0.197"
Expand All @@ -101,8 +101,8 @@ thiserror = "1.0.58"
toml = { version = "0.8.11", features = ["parse"] }
toml_edit = { version = "0.22.7", features = ["parse"] }
url = "2.5.0"
usage-lib = { version="0.1.9", features = ["clap"] }
versions = { version = "6.1.0" , features=["serde"]}
usage-lib = { version = "0.1.9", features = ["clap"] }
versions = { version = "6.1.0", features = ["serde"] }
walkdir = "2.5.0"
which = "6.0.0"
zip = { version = "0.6.6", default-features = false, features = ["deflate"] }
Expand All @@ -127,17 +127,6 @@ native-tls = ["reqwest/native-tls"]
rustls = ["reqwest/rustls-tls", "self_update/rustls"]
rustls-native-roots = ["reqwest/rustls-tls-native-roots", "self_update/rustls"]

[package.metadata.release]
allow-branch = ["main"]
sign-tag = true
sign-commit = true
pre-release-hook = "./scripts/pre-release-hook.sh"
pre-release-replacements = [
{ file = "README.md", search = "^mise [0-9]+.[0-9]+.[0-9]+(-rc.[0-9]+)?$", replace = "mise {{version}}", exactly = 1 },
{ file = "packaging/rpm/mise.spec", search = "^Version: [0-9]+.[0-9]+.[0-9]+(-rc.[0-9]+)?$", replace = "Version: {{version}}", exactly = 1 },
{ file = "default.nix", search = "version = \"[0-9]+.[0-9]+.[0-9]+(-rc.[0-9]+)?\";$", replace = "version = \"{{version}}\";", exactly = 1 },
]

[package.metadata.binstall]
bin-dir = "mise/bin/mise"
[package.metadata.binstall.overrides.aarch64-apple-darwin]
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

## What is it?

* Like [asdf](https://asdf-vm.com) (or [nvm](https://github.com/nvm-sh/nvm) or [pyenv](https://github.com/pyenv/pyenv) but for any language) it manages [dev tools](https://mise.jdx.dev/dev-tools/) like node, python, cmake, terraform, and [hundreds more](https://mise.jdx.dev/plugins.html).
* Like [direnv](https://github.com/direnv/direnv) it manages [environment variables](https://mise.jdx.dev/environments.html) for different project directories.
* Like [make](https://www.gnu.org/software/make/manual/make.html) it manages [tasks](https://mise.jdx.dev/tasks/) used to build and test projects.
- Like [asdf](https://asdf-vm.com) (or [nvm](https://github.com/nvm-sh/nvm) or [pyenv](https://github.com/pyenv/pyenv) but for any language) it manages [dev tools](https://mise.jdx.dev/dev-tools/) like node, python, cmake, terraform, and [hundreds more](https://mise.jdx.dev/plugins.html).
- Like [direnv](https://github.com/direnv/direnv) it manages [environment variables](https://mise.jdx.dev/environments.html) for different project directories.
- Like [make](https://www.gnu.org/software/make/manual/make.html) it manages [tasks](https://mise.jdx.dev/tasks/) used to build and test projects.

## Migrating from rtx

Expand Down
90 changes: 90 additions & 0 deletions cliff.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
# git-cliff ~ default configuration file
# https://git-cliff.org/docs/configuration
#
# Lines starting with "#" are comments.
# Configuration options are organized into tables and keys.
# See documentation for more information on available options.

[changelog]
# changelog header
header = """
# Changelog\n
All notable changes to this project will be documented in this file.\n
"""
# template for the changelog body
# https://keats.github.io/tera/docs/#introduction
body = """
{% if version %}\
## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
{% else %}\
## [unreleased]
{% endif %}\
{% for group, commits in commits | group_by(attribute="group") %}
### {{ group | striptags | trim | upper_first }}
{% for commit in commits %}
- {% if commit.scope %}*({{ commit.scope }})* {% endif %}\
{% if commit.breaking %}[**breaking**] {% endif %}\
{{ commit.message | upper_first }}\
{% endfor %}
{% endfor %}\n
"""
# template for the changelog footer
footer = """
<!-- generated by git-cliff -->
"""
# remove the leading and trailing s
trim = true
# postprocessors
postprocessors = [
# { pattern = '<REPO>', replace = "https://github.com/orhun/git-cliff" }, # replace repository URL
]

[git]
# parse the commits based on https://www.conventionalcommits.org
conventional_commits = true
# filter out the commits that are not conventional
filter_unconventional = true
# process each line of a commit as an individual commit
split_commits = false
# regex for preprocessing the commit messages
commit_preprocessors = [
# Replace issue numbers
#{ pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](<REPO>/issues/${2}))"},
# Check spelling of the commit with https://github.com/crate-ci/typos
# If the spelling is incorrect, it will be automatically fixed.
#{ pattern = '.*', replace_command = 'typos --write-changes -' },
]
# regex for parsing and grouping commits
commit_parsers = [
{ message = "^feat", group = "<!-- 0 -->πŸš€ Features" },
{ message = "^fix\\(deps\\)", skip = true },
{ message = "^fix", group = "<!-- 1 -->πŸ› Bug Fixes" },
{ message = "^doc", group = "<!-- 3 -->πŸ“š Documentation" },
{ message = "^perf", group = "<!-- 4 -->⚑ Performance" },
{ message = "^refactor", group = "<!-- 2 -->🚜 Refactor" },
{ message = "^style", group = "<!-- 5 -->🎨 Styling" },
{ message = "^test", group = "<!-- 6 -->πŸ§ͺ Testing" },
{ message = "^chore\\(release\\): prepare for", skip = true },
{ message = "^chore\\(deps.*\\)", skip = true },
{ message = "^chore\\(pr\\)", skip = true },
{ message = "^chore\\(pull\\)", skip = true },
{ message = "^chore|^ci", group = "<!-- 7 -->βš™οΈ Miscellaneous Tasks" },
{ body = ".*security", group = "<!-- 8 -->πŸ›‘οΈ Security" },
{ message = "^revert", group = "<!-- 9 -->◀️ Revert" },
]
# protect breaking changes from being skipped due to matching a skipping commit_parser
protect_breaking_commits = false
# filter out the commits that are not matched by commit parsers
filter_commits = false
# regex for matching git tags
tag_pattern = 'v\d+\.\d+\.\d+'
# regex for skipping tags
skip_tags = '^v(1|2023)\.'
# regex for ignoring tags
# ignore_tags = ""
# sort the tags topologically
topo_order = false
# sort the commits inside sections by oldest/newest order
sort_commits = "oldest"
# limit the number of commits included in the changelog.
# limit_commits = 42
Loading

0 comments on commit e066f64

Please sign in to comment.