File tree Expand file tree Collapse file tree 3 files changed +14
-2
lines changed
Expand file tree Collapse file tree 3 files changed +14
-2
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ APP ?= unset
1616ORG ?= getoutreach
1717
1818# Transition
19- MAGE_CMD := MAGEFILE_HASHFAST=true mise exec mage@ $( shell grep "^mage:" " $(BOOTSTRAP_DIR ) /versions.yaml" | awk '{ print $$2 }') -- mage -d "$(CURDIR ) /$(shell if [[ "$(APP ) " != "devbase" ]]; then echo ".bootstrap/"; fi) root" -w "$(CURDIR ) "
19+ MAGE_CMD := MAGEFILE_HASHFAST=true " $(BOOTSTRAP_DIR ) /shell/mage.sh" -d "$(CURDIR ) /$(shell if [[ "$(APP ) " != "devbase" ]]; then echo ".bootstrap/"; fi) root" -w "$(CURDIR ) "
2020APP_VERSION := $(shell mise run --quiet version)
2121
2222# go options
Original file line number Diff line number Diff line change @@ -210,7 +210,8 @@ run_mise() {
210210 local wait_for_gh_rate_limit
211211 wait_for_gh_rate_limit=" $( find_tool wait-for-gh-rate-limit) "
212212 if [[ -n $wait_for_gh_rate_limit ]]; then
213- " $wait_for_gh_rate_limit "
213+ # Send output to stderr so that it doesn't affect stdout of mise
214+ " $wait_for_gh_rate_limit " >&2
214215 fi
215216 fi
216217 " $mise_path " " $@ "
Original file line number Diff line number Diff line change 1+ #! /usr/bin/env bash
2+ # Shim to execute `mage` via `mise`.
3+
4+ set -euo pipefail
5+
6+ DIR=" $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " > /dev/null 2>&1 && pwd) "
7+
8+ # shellcheck source=./lib/mise/stub.sh
9+ source " $DIR /lib/mise/stub.sh"
10+
11+ mise_exec_tool mage " $@ "
You can’t perform that action at this time.
0 commit comments