Compare commits

..

17 commits

Author SHA1 Message Date
Junegunn Choi
ab9a552f5b
Re-order CHANGELOG 2026-11-06 10:39:01 +09:00
Junegunn Choi
a38beb544f
Merge remote-tracking branch 'origin/master' into winget-msi 2026-11-06 10:37:26 +09:00
Junegunn Choi
b5c054ee18
Document draft release flow in RELEASE.md 2026-11-05 22:55:33 +09:00
Junegunn Choi
3dd8e03ddc
Fail msi job when release is already published
- Re-run would replace published MSIs with new builds, whose hashes
  differ from a winget manifest that may already be merged
- Also stops winget job from submitting again
2026-11-05 22:55:16 +09:00
Junegunn Choi
02d8843869
Remove make release
- Release workflow replaced it
- With draft releases, it would push master while the release was still
  a draft, so install scripts would point at assets not yet public
2026-11-05 22:55:01 +09:00
Junegunn Choi
c076805825
Note how to switch existing winget installs to MSI 2026-11-04 16:02:58 +09:00
Junegunn Choi
398b66342d
Drop armv7 from winget installer regex
- No Windows armv7 build since 0.73.1
2026-11-04 16:02:58 +09:00
Junegunn Choi
fa30c5a278
Fix wix build path in usage comment
- Source="LICENSE" resolves from repository root, where CI runs it
2026-11-04 16:02:58 +09:00
Junegunn Choi
e279faac50
Replace existing draft when retrying release job
- goreleaser looks up the release by tag, which does not return drafts
- A retry created a second draft for the same tag, and msi job could
  publish either one
2026-11-03 13:51:47 +09:00
Junegunn Choi
386c3e9ea9
Limit winget workflow token to read access
- winget-releaser passes github.token to cargo-bins/cargo-binstall@main
- Token had contents: write from release.yml, and repository default
  (write) when run by hand
2026-11-03 13:51:37 +09:00
Junegunn Choi
14aacc115d
Avoid second environment approval for msi job
- msi job used RELEASE_PAT only so that publishing would trigger
  winget.yml, which required approving the release environment again
- Publish with GITHUB_TOKEN instead and call winget.yml directly
- Skip winget for prerelease versions, as the released event did
2026-10-29 21:41:27 +09:00
Junegunn Choi
5853d57518
Add CHANGELOG entry for #4943 2026-10-26 20:29:14 +09:00
Junegunn Choi
e19c2c4c6e
Shorten MSI comments 2026-10-26 20:28:46 +09:00
Junegunn Choi
68ef9cf0d0
Skip MSI build for prerelease versions
- MSI versions cannot have a suffix such as -rc1, so wix build fails
- Release is still published
2026-10-26 20:27:47 +09:00
Junegunn Choi
243ccc325b
Add MSIs to release checksum file 2026-10-26 20:27:22 +09:00
Junegunn Choi
d7138593f2
Publish release only after MSI upload
- goreleaser creates a draft release
- msi job publishes it after uploading the MSIs
- Publishing triggers winget.yml, which previously ran before the MSIs
  existed and left them out of the manifest
- If the msi job fails, the release stays a draft
2026-10-26 20:26:50 +09:00
Marshall Porter
5b2936db82
Add WiX .msi installer alongside portable zip for Windows
winget currently only has a `portable` installer to offer for fzf, which
installs via a symlink into the WinGet Links folder. That link is created
by whoever runs winget, normally a non-elevated terminal, and Windows will
not let an elevated process follow a link that a less-privileged process
created ("The path cannot be traversed because it contains an untrusted
mount point"). An administrator's SSH session is elevated, so fzf, and the
shell integration that runs it at startup, fails there.

Build a real per-machine .msi with the WiX dotnet-tool CLI (this is a Go
project, so cargo-wix doesn't apply) from the goreleaser-built fzf.exe, for
amd64 and arm64 (WiX's -arch has no armv7 target). It installs to Program
Files with its own machine PATH entry, so there is no link. WiX only runs
on Windows, so the release job hands the Windows binaries to a new msi job
on windows-latest. The MSIs are built in both workflow modes, so a
workflow_dispatch validation run checks them, and uploaded alongside the
.zip on a tag push; the winget-releaser installers-regex also matches .msi.
WiX is pinned to 5.0.2, the last release that does not require accepting
its Open Source Maintenance Fee EULA.
2026-10-26 20:26:33 +09:00
14 changed files with 14 additions and 79 deletions

View file

@ -1,12 +1,6 @@
CHANGELOG
=========
0.75.1
------
- Fixed `--info inline-right:PREFIX` leaving part of the previous output when the info gets shorter (#4953)
- Fixed a one-line picker overwriting the line above it, e.g. `--height=~50%` with inline info and empty input (#4958) (@nhooyr)
- [vim] Fixed the popup window being cropped on Windows when the first redraw after starting the terminal is delayed (#4957) (@FanXiangTM)
0.75.0
------
- Added `{change,transform,bg-transform}-info-command` actions (#4951) (@casperdcl)
@ -36,7 +30,6 @@ CHANGELOG
```
- Fixed `--no-sort` being ignored in filter mode with `--sync`, `--tac`, or `--bench` (#4940) (@NavpreetSSidhu)
- Fixed `--walker=follow` skipping a symlink in one `--walker-root` when its target is an ancestor of another root (#4944) (@mabunemeh)
- Fixed data races in the preview and the search result cache (#4947)
- Fixed O(n^2) action parsing in `--listen`. A single ~1 MB request could block the server for ~30 s (@zachariah-mithani, AploSec)
- Windows
- Fixed `--with-shell` on Windows not detecting cmd, PowerShell, and pwsh, which made fzf quote commands and entries for a POSIX shell (#4936) (@vimkim)

View file

@ -22,7 +22,7 @@ triggered by a tag push.
3. Verify file consistency, sign the tag, and push the tag.
```sh
make tag VERSION=0.75.0
make tag VERSION=0.74.5
```
`make tag` runs `prerelease` first (checks that the version
@ -54,8 +54,8 @@ The release stays a draft. Do not push `master` until it is published.
- Publish without MSIs and submit to winget by hand:
```sh
gh release edit v0.75.0 --draft=false
gh workflow run winget.yml -f release-tag=v0.75.0
gh release edit v0.74.5 --draft=false
gh workflow run winget.yml -f release-tag=v0.74.5
```
## Testing the workflow

View file

@ -2,7 +2,7 @@
set -u
version=0.75.0
version=0.74.5
auto_completion=
key_bindings=
update_config=2

View file

@ -1,4 +1,4 @@
$version="0.75.0"
$version="0.74.5"
$fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition

View file

@ -11,7 +11,7 @@ import (
"github.com/junegunn/fzf/src/protector"
)
var version = "0.75"
var version = "0.74"
var revision = "devel"
//go:embed shell/key-bindings.bash

View file

@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
..
.TH fzf\-tmux 1 "Nov 2026" "fzf 0.75.0" "fzf\-tmux - open fzf in tmux split pane"
.TH fzf\-tmux 1 "Oct 2026" "fzf 0.74.5" "fzf\-tmux - open fzf in tmux split pane"
.SH NAME
fzf\-tmux - open fzf in tmux split pane

View file

@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
..
.TH fzf 1 "Nov 2026" "fzf 0.75.0" "fzf - a command-line fuzzy finder"
.TH fzf 1 "Oct 2026" "fzf 0.74.5" "fzf - a command-line fuzzy finder"
.SH NAME
fzf - a command-line fuzzy finder

View file

@ -1124,10 +1124,6 @@ function! s:execute_term(dict, command, temps) abort
endif
if is_popup
let term_opts.hidden = 1
" Avoid resizing the terminal after fzf starts (#4957)
let bounds = s:popup_bounds()
let term_opts.term_rows = bounds.height
let term_opts.term_cols = bounds.width
else
let term_opts.curwin = 1
endif

View file

@ -137,17 +137,13 @@ func (m *Matcher) Loop() {
m.scanMutex.Lock()
result = m.scan(request)
m.scanMutex.Unlock()
// Not on a cached merger, which the terminal may be reading. It
// already has the same value.
if result.merger != nil {
result.merger.final = request.final
}
}
if !result.cancelled {
if result.cacheable() {
m.mergerCache[patternString] = result
}
result.merger.final = request.final
m.eventBox.Set(EvtSearchFin, result)
}
}

View file

@ -843,8 +843,6 @@ type previewRequest struct {
list [3][]*Item // current, select, and all matched items
env []string
query string
lastAction actionType
prompt string
}
type previewResult struct {
@ -3664,10 +3662,7 @@ func (t *Terminal) printInfoImpl() {
pos++
}
} else {
move(line, pos, false)
newPos := max(pos, t.window.Width()-outputLen-util.StringWidth(t.infoPrefix)-1)
t.window.Print(strings.Repeat(" ", newPos-pos))
pos = newPos
pos = max(pos, t.window.Width()-outputLen-util.StringWidth(t.infoPrefix)-1)
printInfoPrefix()
}
}
@ -6463,8 +6458,6 @@ func (t *Terminal) Loop() error {
var commandTemplate string
var env []string
var query string
var lastAction actionType
var prompt string
initialOffset := 0
t.previewBox.Wait(func(events *util.Events) {
for req, value := range *events {
@ -6479,8 +6472,6 @@ func (t *Terminal) Loop() error {
items = request.list
env = request.env
query = request.query
lastAction = request.lastAction
prompt = request.prompt
requested = true
}
}
@ -6495,18 +6486,7 @@ func (t *Terminal) Loop() error {
version++
// We don't display preview window if no match
if items[0] != nil {
// Not t.replacePlaceholder, which reads fields the main loop writes
command, tempFiles := replacePlaceholder(replacePlaceholderParams{
template: commandTemplate,
stripAnsi: t.ansi,
delimiter: t.delimiter,
printsep: t.printsep,
query: query,
allItems: items,
lastAction: lastAction,
prompt: prompt,
executor: t.executor,
})
command, tempFiles := t.replacePlaceholder(commandTemplate, false, query, items)
cmd := t.executor.ExecCommand(command, true)
cmd.Env = env
@ -6639,7 +6619,7 @@ func (t *Terminal) Loop() error {
if len(command) > 0 && t.canPreview() {
_, list := t.buildPlusList(command, false)
t.cancelPreview()
t.previewBox.Set(reqPreviewEnqueue, previewRequest{command, t.evaluateScrollOffset(), list, t.environForPreview(), string(t.input), t.lastAction, t.promptString})
t.previewBox.Set(reqPreviewEnqueue, previewRequest{command, t.evaluateScrollOffset(), list, t.environForPreview(), string(t.input)})
}
}
@ -7254,7 +7234,7 @@ func (t *Terminal) Loop() error {
if valid {
t.cancelPreview()
t.previewBox.Set(reqPreviewEnqueue,
previewRequest{t.previewOpts.command, t.evaluateScrollOffset(), list, t.environForPreview(), string(t.input), t.lastAction, t.promptString})
previewRequest{t.previewOpts.command, t.evaluateScrollOffset(), list, t.environForPreview(), string(t.input)})
}
} else {
// Discard the preview content so that it won't accidentally appear

View file

@ -292,10 +292,7 @@ func (r *LightRenderer) Init() error {
}
r.enableModes()
// CSI 0 A means one row up, not zero rows.
if height := r.MaxY(); height > 1 {
r.csi(fmt.Sprintf("%dA", height-1))
}
r.csi(fmt.Sprintf("%dA", r.MaxY()-1))
r.csi("G")
r.csi("K")
if !r.clearOnExit && !r.fullscreen {

View file

@ -1792,13 +1792,6 @@ class TestCore < TestInteractive
tmux.until { assert_match(%r{ 0/100000}, it[-1]) }
end
def test_info_inline_right_prefix_clearance
tmux.send_keys "seq 100000 | #{FZF} --info 'inline-right:xx '", :Enter
tmux.until { assert_match(%r{xx 100000/100000}, it[-1]) }
tmux.send_keys 'x'
tmux.until { assert_match(%r{ xx 0/100000}, it[-1]) }
end
def test_info_command
tmux.send_keys(%(seq 10000 | #{FZF} --separator x --info-command 'echo -e "--\\x1b[33m$FZF_POS\\x1b[m/$FZF_INFO--"'), :Enter)
tmux.until { assert_match(%r{^ --1/10000/10000-- xx}, it[-2]) }

View file

@ -187,17 +187,6 @@ class TestLayout < TestInteractive
tmux.until { assert_block(expected, it) }
end
def test_height_range_empty_input_preserves_previous_line
tmux.send_keys %(printf 'KEEP THIS LINE\\n'; : | FZF_DEFAULT_OPTS_FILE= #{FZF} --style=minimal --height='~50%' --info=inline-right), :Enter
tmux.until do |lines|
assert_match(%r{0/0}, lines.last)
assert_equal 'KEEP THIS LINE', lines[-2]
end
tmux.send_keys 'C-c'
tmux.until { |lines| assert_equal 'KEEP THIS LINE', lines.last }
end
def test_height_range_fit_preview_above
tmux.send_keys 'seq 3 | fzf --height ~100% --info=inline --border rounded --preview-window border-rounded --preview "seq {}" --preview-window up,60%', :Enter
expected = <<~OUTPUT

View file

@ -640,15 +640,6 @@ class TestPreview < TestInteractive
end
end
def test_preview_action_and_prompt
tmux.send_keys %(seq 100 | #{FZF} --preview 'echo [$FZF_ACTION/$FZF_PROMPT/{q}]' --bind 'space:change-prompt(foo> )'), :Enter
tmux.until { |lines| assert lines.any_include?('[start/> /]') }
tmux.send_keys '1'
tmux.until { |lines| assert lines.any_include?('[char/> /1]') }
tmux.send_keys :Space, '2'
tmux.until { |lines| assert lines.any_include?('[char/foo> /12]') }
end
def test_preview_wrap_sign_between_ansi_fragments
tmux.send_keys %(seq 1 | #{FZF} --preview 'echo -e "\\x1b[33m1234567890 \\x1b[mhello"; echo -e "\\x1b[33m1234567890 \\x1b[mhello"' --preview-window 10,wrap-word), :Enter
tmux.until do |lines|