From 4ea200b04d374ba1bb9f66a940430309a2838d27 Mon Sep 17 00:00:00 2001 From: Valentin Kiselev Date: Fri, 21 Jun 2024 13:30:15 +0300 Subject: [PATCH] 1.6.18: allow multiple levels of extends option --- CHANGELOG.md | 4 ++++ docs/install.md | 2 +- 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 +- 16 files changed, 27 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb8d29d1..0fb7064b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## master (unreleased) +## 1.6.18 (2024-06-21) + +- fix: allow multiple levels of extends ([#755](https://github.com/evilmartians/lefthook/pull/755)) by @mrexox + ## 1.6.17 (2024-06-20) - fix: apply local extends only if they are present ([#754](https://github.com/evilmartians/lefthook/pull/754)) by @mrexox diff --git a/docs/install.md b/docs/install.md index f6d1b729..6ddb64e9 100644 --- a/docs/install.md +++ b/docs/install.md @@ -78,7 +78,7 @@ You can find the Swift wrapper plugin [here](https://github.com/csjones/lefthook Utilize lefthook in your Swift project using Swift Package Manager: ```swift -.package(url: "https://github.com/csjones/lefthook-plugin.git", exact: "1.6.17"), +.package(url: "https://github.com/csjones/lefthook-plugin.git", exact: "1.6.18"), ``` Or, with [mint](https://github.com/yonaskolb/Mint): diff --git a/internal/version/version.go b/internal/version/version.go index 84f1ee4a..79341075 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -8,7 +8,7 @@ import ( "strconv" ) -const version = "1.6.17" +const version = "1.6.18" var ( // Is set via -X github.com/evilmartians/lefthook/internal/version.commit={commit}. diff --git a/packaging/Makefile b/packaging/Makefile index 26c4e247..642dbe1b 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -1,5 +1,5 @@ # Packages version to release -VERSION := 1.6.17 +VERSION := 1.6.18 DIST_DIR := ../dist diff --git a/packaging/npm-bundled/package.json b/packaging/npm-bundled/package.json index 4be04c2a..28dde3bd 100644 --- a/packaging/npm-bundled/package.json +++ b/packaging/npm-bundled/package.json @@ -1,6 +1,6 @@ { "name": "@evilmartians/lefthook", - "version": "1.6.17", + "version": "1.6.18", "description": "Simple git hooks manager", "main": "index.js", "bin": { diff --git a/packaging/npm-installer/package.json b/packaging/npm-installer/package.json index 59376635..4282e6a9 100644 --- a/packaging/npm-installer/package.json +++ b/packaging/npm-installer/package.json @@ -1,6 +1,6 @@ { "name": "@evilmartians/lefthook-installer", - "version": "1.6.17", + "version": "1.6.18", "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 e898e7ef..a542c879 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.6.17", + "version": "1.6.18", "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 fdc5b5de..4326f58c 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.6.17", + "version": "1.6.18", "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 32afe924..2fb90948 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.6.17", + "version": "1.6.18", "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 9451298e..1de76b75 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.6.17", + "version": "1.6.18", "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 c348bdaf..ce54f941 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.6.17", + "version": "1.6.18", "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 0dba45cb..dbf3e771 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.6.17", + "version": "1.6.18", "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 9d1aeb8e..b189ab91 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.6.17", + "version": "1.6.18", "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 93a8a644..0ed12944 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.6.17", + "version": "1.6.18", "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 104159ca..3ddc8013 100644 --- a/packaging/npm/lefthook/package.json +++ b/packaging/npm/lefthook/package.json @@ -1,6 +1,6 @@ { "name": "lefthook", - "version": "1.6.17", + "version": "1.6.18", "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.6.17", - "lefthook-darwin-x64": "1.6.17", - "lefthook-linux-arm64": "1.6.17", - "lefthook-linux-x64": "1.6.17", - "lefthook-freebsd-arm64": "1.6.17", - "lefthook-freebsd-x64": "1.6.17", - "lefthook-windows-arm64": "1.6.17", - "lefthook-windows-x64": "1.6.17" + "lefthook-darwin-arm64": "1.6.18", + "lefthook-darwin-x64": "1.6.18", + "lefthook-linux-arm64": "1.6.18", + "lefthook-linux-x64": "1.6.18", + "lefthook-freebsd-arm64": "1.6.18", + "lefthook-freebsd-x64": "1.6.18", + "lefthook-windows-arm64": "1.6.18", + "lefthook-windows-x64": "1.6.18" }, "scripts": { "postinstall": "node postinstall.js" diff --git a/packaging/rubygems/lefthook.gemspec b/packaging/rubygems/lefthook.gemspec index 1dee9884..d502de8e 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.6.17" + spec.version = "1.6.18" spec.authors = ["A.A.Abroskin", "Evil Martians"] spec.email = ["lefthook@evilmartians.com"]