Skip to content

Commit 1b4cec3

Browse files
authored
Merge branch 'master' into fix-multiword-tools
2 parents 3974e8a + 1553947 commit 1b4cec3

File tree

7 files changed

+11
-21
lines changed

7 files changed

+11
-21
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup Go
2929
uses: actions/setup-go@v5
3030
with:
31-
go-version: '1.23.4'
31+
go-version: '1.24.9'
3232
- name: Install dependencies
3333
run: go get ./...
3434
- name: Run 'gofumpt'

.github/workflows/release-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
github_token: ${{ secrets.GITHUB_TOKEN }}
4242
goos: ${{ matrix.goos }}
4343
goarch: ${{ matrix.goarch }}
44-
goversion: "1.23.4"
44+
goversion: "1.24.9"
4545
binary_name: "asdf"
4646
project_path: ./cmd/asdf
4747
release_tag: ${{ github.event.release.tag_name || inputs.tag }}

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Setup Go
5353
uses: actions/setup-go@v5
5454
with:
55-
go-version: '1.23.4'
55+
go-version: '1.24.9'
5656
- run: scripts/install_dependencies.bash
5757
- name: Install dependencies
5858
run: go get ./...

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
golang 1.23.4
1+
golang 1.24.9
22
bats 1.8.2
33
shellcheck 0.10.0
44
shfmt 3.6.0

docs/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/asdf-vm/asdf
22

3-
go 1.23.4
3+
go 1.24.9
44

55
require (
66
github.com/go-git/go-git/v5 v5.13.0

internal/completions/asdf.zsh

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,8 @@ case "$subcmd" in
309309
# After flag, complete with plugin name
310310
_asdf__installed_plugins
311311
else
312-
# Complete with available versions for the plugin
313-
local versions
314-
if versions=$(asdf list all "${words[3]}" 2>/dev/null); then
315-
_wanted "versions-${words[3]}" \
316-
expl "Available versions of ${words[3]}" \
317-
compadd -- ${(f)versions}
318-
fi
312+
# Complete with installed versions for the plugin
313+
_asdf__installed_versions_of_plus_system ${words[3]}
319314
fi
320315
;;
321316
*)
@@ -325,12 +320,7 @@ case "$subcmd" in
325320
else
326321
local plugin="${words[3]}"
327322
fi
328-
local versions
329-
if versions=$(asdf list all "$plugin" 2>/dev/null); then
330-
_wanted "versions-$plugin" \
331-
expl "Available versions of $plugin" \
332-
compadd -- ${(f)versions}
333-
fi
323+
_asdf__installed_versions_of_plus_system $plugin
334324
;;
335325
esac
336326
;;

0 commit comments

Comments
 (0)