From cac8b7138ed3eb013f826eceafe40b5d4d87943c Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Tue, 2 Jan 2024 18:09:03 -0500 Subject: [PATCH] fix(mise) closes #4701 bin rename --- projects/crates.io/rtx-cli/package.yml | 24 +++++++++++----- projects/mise.jdx.dev/package.yml | 40 ++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 projects/mise.jdx.dev/package.yml diff --git a/projects/crates.io/rtx-cli/package.yml b/projects/crates.io/rtx-cli/package.yml index 5697ade4..cf9ebac4 100644 --- a/projects/crates.io/rtx-cli/package.yml +++ b/projects/crates.io/rtx-cli/package.yml @@ -1,13 +1,16 @@ distributable: - url: https://github.com/jdxcode/rtx/archive/refs/tags/v{{version}}.tar.gz + url: https://github.com/jdx/mise/archive/refs/tags/v{{version}}.tar.gz strip-components: 1 -provides: - - bin/rtx +# renamed at 2024.1.0 +# provides: +# - bin/rtx +# - bin/mise versions: - github: jdxcode/rtx + github: jdx/mise strip: /v/ + ignore: [0.x.y, 1.x.y] # they moved to calver dependencies: openssl.org: ^1.1 # newer RTX after 1.35.2 versions require openssl @@ -18,11 +21,18 @@ build: rust-lang.org/cargo: '*' freedesktop.org/pkg-config: '*' script: - cargo install --locked --path . --root {{prefix}} + - cargo install --locked --path . --root {{prefix}} + # FIXME: <2024 isn't matching like it should. this should be split at 2024.1.0 + - run: | + if test -f rtx; then + ln -s rtx mise + elif test -f mise; then + ln -s mise rtx + fi + working-directory: '{{prefix}}/bin' env: linux/x86-64: # portable-atomic-1.3.1 uses this, but it's unstable RUSTFLAGS: -C target-feature=+cmpxchg16b -test: - rtx --version +test: mise --version diff --git a/projects/mise.jdx.dev/package.yml b/projects/mise.jdx.dev/package.yml new file mode 100644 index 00000000..0a623cee --- /dev/null +++ b/projects/mise.jdx.dev/package.yml @@ -0,0 +1,40 @@ +distributable: + url: https://github.com/jdx/mise/archive/refs/tags/v{{version}}.tar.gz + strip-components: 1 + +# renamed at 2024.1.0 +display-name: mise + +provides: + - bin/rtx + - bin/mise + +versions: + github: jdx/mise + strip: /v/ + ignore: [0.x.y, 1.x.y] # they moved to calver + +dependencies: + openssl.org: ^1.1 # newer mise after 1.35.2 versions require openssl + +build: + dependencies: + rust-lang.org: ^1.70 + rust-lang.org/cargo: '*' + freedesktop.org/pkg-config: '*' + script: + - cargo install --locked --path . --root {{prefix}} + # FIXME: <2024 isn't matching like it should. this should be split at 2024.1.0 + - run: | + if test -f rtx; then + ln -s rtx mise + elif test -f mise; then + ln -s mise rtx + fi + working-directory: '{{prefix}}/bin' + env: + linux/x86-64: + # portable-atomic-1.3.1 uses this, but it's unstable + RUSTFLAGS: -C target-feature=+cmpxchg16b + +test: mise --version