Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/streetsidesoftware…
Browse files Browse the repository at this point in the history
…/cspell-action-4
  • Loading branch information
kamontat authored Nov 6, 2023
2 parents e7dead5 + 1b50558 commit 306b2ec
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions scripts/dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export COMPONENTS=(
gh git-chglog go-jsonnet golang golangci-lint gradle
helm hub hyperfine
jq jsonnet-bundler
k6 kind kubectl
k6 kind kops kubectl
maven mkcert
pipx
terraform terragrunt
Expand Down Expand Up @@ -105,7 +105,7 @@ __internal() {

local init
for init in "${_INITIATORS[@]}"; do
"$init"
"$init" || return 1
done

"$cb" "$@"
Expand Down
3 changes: 3 additions & 0 deletions scripts/libs/core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,19 @@ core_start() {

runner "$component" shell-latest \
$ check_must_success get-latest \
$ check_must_success install-latest \
$ check_cmd_pass feat_is_test \
$ exec_with_file asdf shell "$component" "$latest"

runner "$component" "test-latest" \
$ check_must_success get-latest \
$ check_must_success install-latest \
$ check_cmd_pass feat_is_test \
$ exec_with_file asdf "$component" test

runner "$component" "uninstall-latest" \
$ check_must_success get-latest \
$ check_must_success install-latest \
$ check_cmd_pass feat_is_test \
$ exec_with_file asdf uninstall "$component" "$latest"

Expand Down
5 changes: 3 additions & 2 deletions scripts/libs/executor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ exec_with_file() {
db_set_exec_log "$component" "$step" "$stdout"
db_set_exec_err "$component" "$step" "$stderr"
if ! __exec_cmd "$component" "$step" "$@" >"$stdout" 2>"$stderr"; then
db_set_exec_msg "$component" "$step" "$(head -n1 "$stderr")"
db_set_exec_msg "$component" "$step" "$(tail -n1 "$stderr")"
return 1
fi
}
Expand All @@ -67,7 +67,8 @@ exec_copier() {
args+=(--vcs-ref HEAD)
fi

if feat_is_prompt; then
## Enabled prompt mode if user enabled or on newly create plugin
if feat_is_prompt || ! test -d "$install_path"; then
exec_default "$component" "$step" \
"$cmd" "${args[@]}" "$template" "$install_path"
else
Expand Down
4 changes: 2 additions & 2 deletions templates/.github/workflows/main.yml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v4
- name: Running cspell
uses: streetsidesoftware/cspell-action@v3
uses: streetsidesoftware/cspell-action@v4
with:
config: ".github/linters/cspell.json"
# Log progress and other information during the action execution.
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
runs-on: {{ '${{ matrix.os }}' }}
steps:
- name: asdf_plugin_test
uses: asdf-vm/actions/plugin-test@v2
uses: asdf-vm/actions/plugin-test@v3
with:
command: {% include pathjoin('macros', 'test-cmd.jinja') %}
env:
Expand Down

0 comments on commit 306b2ec

Please sign in to comment.