From 596d3ea6113f67fd6004cd883c356f85246b1079 Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Mon, 24 Jul 2023 11:47:03 +0300 Subject: [PATCH] 1.4.7: fix remote extends merging issue --- CHANGELOG.md | 7 +++++++ internal/version/version.go | 2 +- packaging/Makefile | 2 +- packaging/npm-bundled/package.json | 2 +- packaging/npm-installer/package.json | 2 +- .../npm/lefthook-darwin-arm64/package.json | 2 +- packaging/npm/lefthook-darwin-x64/package.json | 2 +- .../npm/lefthook-freebsd-arm64/package.json | 2 +- .../npm/lefthook-freebsd-x64/package.json | 2 +- .../npm/lefthook-linux-arm64/package.json | 2 +- packaging/npm/lefthook-linux-x64/package.json | 2 +- .../npm/lefthook-windows-arm64/package.json | 2 +- .../npm/lefthook-windows-x64/package.json | 2 +- packaging/npm/lefthook/package.json | 18 +++++++++--------- packaging/rubygems/lefthook.gemspec | 2 +- 15 files changed, 29 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a58a340f..b1ae94a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## master (unreleased) +## 1.4.7 (2023-07-24) + +- docs: add scoop installation method ([#527](https://github.com/evilmartians/lefthook/pull/527)) by @sitiom +- fix: correct merging of extends from remote config ([#529](https://github.com/evilmartians/lefthook/pull/529)) by @mrexox +- ci: add Winget Releaser action ([#526](https://github.com/evilmartians/lefthook/pull/526)) by @sitiom +- chore: improve correctness of load_test.go ([#525](https://github.com/evilmartians/lefthook/pull/525)) by @hyperupcall + ## 1.4.6 (2023-07-18) - fix: do not print extraneous newlines when executionInfo output is hidden ([#519](https://github.com/evilmartians/lefthook/pull/519)) by @hyperupcall diff --git a/internal/version/version.go b/internal/version/version.go index 36fbb8f7..e37eecb5 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -6,7 +6,7 @@ import ( "strconv" ) -const version = "1.4.6" +const version = "1.4.7" var ( // Is set via -X github.com/evilmartians/lefthook/internal/version.commit={commit}. diff --git a/packaging/Makefile b/packaging/Makefile index d396361a..a5e871be 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -1,5 +1,5 @@ # Packages version to release -VERSION := 1.4.6 +VERSION := 1.4.7 DIST_DIR := ../dist diff --git a/packaging/npm-bundled/package.json b/packaging/npm-bundled/package.json index a052f0b7..d144006f 100644 --- a/packaging/npm-bundled/package.json +++ b/packaging/npm-bundled/package.json @@ -1,6 +1,6 @@ { "name": "@evilmartians/lefthook", - "version": "1.4.6", + "version": "1.4.7", "description": "Simple git hooks manager", "main": "index.js", "bin": { diff --git a/packaging/npm-installer/package.json b/packaging/npm-installer/package.json index 91b43413..66d71aed 100644 --- a/packaging/npm-installer/package.json +++ b/packaging/npm-installer/package.json @@ -1,6 +1,6 @@ { "name": "@evilmartians/lefthook-installer", - "version": "1.4.6", + "version": "1.4.7", "description": "Simple git hooks manager", "main": "index.js", "bin": { diff --git a/packaging/npm/lefthook-darwin-arm64/package.json b/packaging/npm/lefthook-darwin-arm64/package.json index ecd59c19..f66cec82 100644 --- a/packaging/npm/lefthook-darwin-arm64/package.json +++ b/packaging/npm/lefthook-darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-darwin-arm64", - "version": "1.4.6", + "version": "1.4.7", "description": "The macOS ARM 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-darwin-x64/package.json b/packaging/npm/lefthook-darwin-x64/package.json index 82d1cf23..4aa06a46 100644 --- a/packaging/npm/lefthook-darwin-x64/package.json +++ b/packaging/npm/lefthook-darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-darwin-x64", - "version": "1.4.6", + "version": "1.4.7", "description": "The macOS 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-freebsd-arm64/package.json b/packaging/npm/lefthook-freebsd-arm64/package.json index e7f4efdb..0c82eaf6 100644 --- a/packaging/npm/lefthook-freebsd-arm64/package.json +++ b/packaging/npm/lefthook-freebsd-arm64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-freebsd-arm64", - "version": "1.4.6", + "version": "1.4.7", "description": "The FreeBSD ARM 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-freebsd-x64/package.json b/packaging/npm/lefthook-freebsd-x64/package.json index 9740ab6b..354fd45b 100644 --- a/packaging/npm/lefthook-freebsd-x64/package.json +++ b/packaging/npm/lefthook-freebsd-x64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-freebsd-x64", - "version": "1.4.6", + "version": "1.4.7", "description": "The FreeBSD 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-linux-arm64/package.json b/packaging/npm/lefthook-linux-arm64/package.json index ab514f81..445eba45 100644 --- a/packaging/npm/lefthook-linux-arm64/package.json +++ b/packaging/npm/lefthook-linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-linux-arm64", - "version": "1.4.6", + "version": "1.4.7", "description": "The Linux ARM 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-linux-x64/package.json b/packaging/npm/lefthook-linux-x64/package.json index 9a613e7c..c1e5d7a0 100644 --- a/packaging/npm/lefthook-linux-x64/package.json +++ b/packaging/npm/lefthook-linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-linux-x64", - "version": "1.4.6", + "version": "1.4.7", "description": "The Linux 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-windows-arm64/package.json b/packaging/npm/lefthook-windows-arm64/package.json index eb5ad239..2baadc2e 100644 --- a/packaging/npm/lefthook-windows-arm64/package.json +++ b/packaging/npm/lefthook-windows-arm64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-windows-arm64", - "version": "1.4.6", + "version": "1.4.7", "description": "The Windows ARM 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook-windows-x64/package.json b/packaging/npm/lefthook-windows-x64/package.json index 34758584..9ef017ed 100644 --- a/packaging/npm/lefthook-windows-x64/package.json +++ b/packaging/npm/lefthook-windows-x64/package.json @@ -1,6 +1,6 @@ { "name": "lefthook-windows-x64", - "version": "1.4.6", + "version": "1.4.7", "description": "The Windows 64-bit binary for lefthook, git hooks manager.", "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", diff --git a/packaging/npm/lefthook/package.json b/packaging/npm/lefthook/package.json index dd0de386..431af39d 100644 --- a/packaging/npm/lefthook/package.json +++ b/packaging/npm/lefthook/package.json @@ -1,6 +1,6 @@ { "name": "lefthook", - "version": "1.4.6", + "version": "1.4.7", "description": "Simple git hooks manager", "main": "index.js", "repository": "https://github.com/evilmartians/lefthook", @@ -20,14 +20,14 @@ }, "homepage": "https://github.com/evilmartians/lefthook#readme", "optionalDependencies": { - "lefthook-darwin-arm64": "1.4.6", - "lefthook-darwin-x64": "1.4.6", - "lefthook-linux-arm64": "1.4.6", - "lefthook-linux-x64": "1.4.6", - "lefthook-freebsd-arm64": "1.4.6", - "lefthook-freebsd-x64": "1.4.6", - "lefthook-windows-arm64": "1.4.6", - "lefthook-windows-x64": "1.4.6" + "lefthook-darwin-arm64": "1.4.7", + "lefthook-darwin-x64": "1.4.7", + "lefthook-linux-arm64": "1.4.7", + "lefthook-linux-x64": "1.4.7", + "lefthook-freebsd-arm64": "1.4.7", + "lefthook-freebsd-x64": "1.4.7", + "lefthook-windows-arm64": "1.4.7", + "lefthook-windows-x64": "1.4.7" }, "scripts": { "postinstall": "node postinstall.js" diff --git a/packaging/rubygems/lefthook.gemspec b/packaging/rubygems/lefthook.gemspec index 2260037b..7d371693 100644 --- a/packaging/rubygems/lefthook.gemspec +++ b/packaging/rubygems/lefthook.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |spec| spec.name = "lefthook" - spec.version = "1.4.6" + spec.version = "1.4.7" spec.authors = ["A.A.Abroskin", "Evil Martians"] spec.email = ["lefthook@evilmartians.com"]