diff options
| -rw-r--r-- | .goreleaser.yml | 96 | ||||
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rwxr-xr-x | install | 6 | ||||
| -rw-r--r-- | install.ps1 | 2 | ||||
| -rw-r--r-- | man/man1/fzf-tmux.1 | 2 | ||||
| -rw-r--r-- | man/man1/fzf.1 | 2 |
6 files changed, 54 insertions, 64 deletions
diff --git a/.goreleaser.yml b/.goreleaser.yml index 971ccb79..b6131591 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,4 +1,5 @@ --- +version: 2 project_name: fzf before: @@ -6,60 +7,9 @@ before: - go mod download builds: - - id: fzf-macos - binary: fzf - goos: - - darwin - goarch: - - amd64 - flags: - - -trimpath - ldflags: - - "-s -w -X main.version={{ .Version }} -X main.revision={{ .ShortCommit }}" - hooks: - post: | - sh -c ' - cat > /tmp/fzf-gon-amd64.hcl << EOF - source = ["./dist/fzf-macos_darwin_amd64_v1/fzf"] - bundle_id = "junegunn.fzf" - sign { - application_identity = "Developer ID Application: Junegunn Choi (Y254DRW44Z)" - } - zip { - output_path = "./dist/fzf-{{ .Version }}-darwin_amd64.zip" - } - EOF - gon /tmp/fzf-gon-amd64.hcl - ' - - - id: fzf-macos-arm - binary: fzf - goos: - - darwin - goarch: - - arm64 - flags: - - -trimpath - ldflags: - - "-s -w -X main.version={{ .Version }} -X main.revision={{ .ShortCommit }}" - hooks: - post: | - sh -c ' - cat > /tmp/fzf-gon-arm64.hcl << EOF - source = ["./dist/fzf-macos-arm_darwin_arm64/fzf"] - bundle_id = "junegunn.fzf" - sign { - application_identity = "Developer ID Application: Junegunn Choi (Y254DRW44Z)" - } - zip { - output_path = "./dist/fzf-{{ .Version }}-darwin_arm64.zip" - } - EOF - gon /tmp/fzf-gon-arm64.hcl - ' - - id: fzf goos: + - darwin - linux - windows - freebsd @@ -89,6 +39,42 @@ builds: - goos: openbsd goarch: arm64 +# .goreleaser.yaml +notarize: + macos: + - # Whether this configuration is enabled or not. + # + # Default: false. + # Templates: allowed. + enabled: "{{ not .IsSnapshot }}" + + # Before notarizing, we need to sign the binary. + # This blocks defines the configuration for doing so. + sign: + # The .p12 certificate file path or its base64'd contents. + certificate: "{{.Env.MACOS_SIGN_P12}}" + + # The password to be used to open the certificate. + password: "{{.Env.MACOS_SIGN_PASSWORD}}" + + # Then, we notarize the binaries. + notarize: + # The issuer ID. + # Its the UUID you see when creating the App Store Connect key. + issuer_id: "{{.Env.MACOS_NOTARY_ISSUER_ID}}" + + # Key ID. + # You can see it in the list of App Store Connect Keys. + # It will also be in the ApiKey filename. + key_id: "{{.Env.MACOS_NOTARY_KEY_ID}}" + + # The .p8 key file path or its base64'd contents. + key: "{{.Env.MACOS_NOTARY_KEY}}" + + # Whether to wait for the notarization to finish. + # Not recommended, as it could take a really long time. + wait: true + archives: - name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}" builds: @@ -100,18 +86,12 @@ archives: files: - non-existent* -checksum: - extra_files: - - glob: ./dist/fzf-*darwin*.zip - release: github: owner: junegunn name: fzf prerelease: auto name_template: '{{ .Version }}' - extra_files: - - glob: ./dist/fzf-*darwin*.zip snapshot: name_template: "{{ .Version }}-devel" diff --git a/CHANGELOG.md b/CHANGELOG.md index 44505597..86fad6d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ CHANGELOG ========= +0.54.2 +------ +- Fixed incorrect syntax highlighting of truncated multi-line entries +- Updated GoReleaser to 2.1.0 to simplify notarization of macOS binaries + - macOS archives will be in `tar.gz` format instead of `zip` format since we no longer notarize the zip files but binaries +- (Windows) Reverted a mintty fix in 0.54.0 + - As a result, mouse may not work on mintty in fullscreen mode. However, fzf will correctly read non-ASCII input in fullscreen mode (`--no-height`). + - fzf unfortunately cannot read non-ASCII input when not in fullscreen mode on Windows. So if you need to input non-ASCII characters, add `--no-height` to your `$FZF_DEFAULT_OPTS`. + - Any help in fixing this issue will be appreciated (#3799, #3847). + 0.54.1 ------ - Updated [fastwalk](https://github.com/charlievieth/fastwalk) dependency for built-in directory walker @@ -2,7 +2,7 @@ set -u -version=0.54.1 +version=0.54.2 auto_completion= key_bindings= update_config=2 @@ -168,8 +168,8 @@ archi=$(uname -sm) binary_available=1 binary_error="" case "$archi" in - Darwin\ arm64) download fzf-$version-darwin_arm64.zip ;; - Darwin\ x86_64) download fzf-$version-darwin_amd64.zip ;; + Darwin\ arm64) download fzf-$version-darwin_arm64.tar.gz ;; + Darwin\ x86_64) download fzf-$version-darwin_amd64.tar.gz ;; Linux\ armv5*) download fzf-$version-linux_armv5.tar.gz ;; Linux\ armv6*) download fzf-$version-linux_armv6.tar.gz ;; Linux\ armv7*) download fzf-$version-linux_armv7.tar.gz ;; diff --git a/install.ps1 b/install.ps1 index d363d8ea..acb0a68d 100644 --- a/install.ps1 +++ b/install.ps1 @@ -1,4 +1,4 @@ -$version="0.54.1" +$version="0.54.2" $fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition diff --git a/man/man1/fzf-tmux.1 b/man/man1/fzf-tmux.1 index a00f2053..fb7919db 100644 --- a/man/man1/fzf-tmux.1 +++ b/man/man1/fzf-tmux.1 @@ -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 "Jul 2024" "fzf 0.54.1" "fzf\-tmux - open fzf in tmux split pane" +.TH fzf\-tmux 1 "Jul 2024" "fzf 0.54.2" "fzf\-tmux - open fzf in tmux split pane" .SH NAME fzf\-tmux - open fzf in tmux split pane diff --git a/man/man1/fzf.1 b/man/man1/fzf.1 index df1f4770..2be74bc9 100644 --- a/man/man1/fzf.1 +++ b/man/man1/fzf.1 @@ -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 "Jul 2024" "fzf 0.54.1" "fzf - a command-line fuzzy finder" +.TH fzf 1 "Jul 2024" "fzf 0.54.2" "fzf - a command-line fuzzy finder" .SH NAME fzf - a command-line fuzzy finder |