From dd89c0fb17b995a1f0ff029e9738946cf59c78ef Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 17 Jun 2024 19:24:22 +0200 Subject: [PATCH 1/9] chore: update generated ts def --- web/src/api/schema.d.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/src/api/schema.d.ts b/web/src/api/schema.d.ts index d3908c02..2f72ee72 100644 --- a/web/src/api/schema.d.ts +++ b/web/src/api/schema.d.ts @@ -142,8 +142,6 @@ export interface components { pathItems: never; } -export type $defs = Record; - export type external = Record; export interface operations { From 4aa3d4459c39f780774bc577e13b1ef40db1f654 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 17 Jun 2024 19:25:27 +0200 Subject: [PATCH 2/9] chore: track nix lock files --- .gitignore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitignore b/.gitignore index a7cd14bb..40b2fd66 100644 --- a/.gitignore +++ b/.gitignore @@ -6,11 +6,6 @@ htpasswd .yarn -# Nix -gomod2nix.toml -Cargo.nix -crate-hashes.json - # Misc /demos /stacks From aa6fcd4e406d7341a80349dd76a06cb37ee6b45c Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 17 Jun 2024 19:35:52 +0200 Subject: [PATCH 3/9] fix(nix): regenerate nix crate lock, ignore trailing newline lint --- .pre-commit-config.yaml | 1 + Cargo.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3aa7d999..9695fb8d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,6 +9,7 @@ repos: # Generated file exclude: ^web/src/api/schema.d.ts|extra/.*$ - id: end-of-file-fixer + exclude: Cargo.nix - id: detect-aws-credentials args: ["--allow-missing-credentials"] - id: detect-private-key diff --git a/Cargo.nix b/Cargo.nix index 2b1e1aa1..a3ac620c 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -9465,7 +9465,7 @@ rec { }; "stackablectl" = rec { crateName = "stackablectl"; - version = "24.3.4"; + version = "24.3.5"; edition = "2021"; crateBin = [ { From 5426623bac092601cb9157bbf89787ccc46b0eaa Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 17 Jun 2024 19:40:11 +0200 Subject: [PATCH 4/9] chore(pre-commit): regenerate Cargo.nix --- .pre-commit-config.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9695fb8d..bd5e0c00 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -78,3 +78,10 @@ repos: entry: cargo xtask gen-docs stages: [commit, merge-commit, manual] pass_filenames: false + - id: gen-cargo-nix + name: gen-cargo-nix + files: ^Cargo\.lock|go\.mod$ + language: system + entry: make regenerate-nix + stages: [commit, merge-commit, manual] + pass_filename: false From 1c88bce499fd86eae4400e123a760a66087bb2b9 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 17 Jun 2024 20:31:19 +0200 Subject: [PATCH 5/9] fix(pre-commit): make the regex correct --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bd5e0c00..73f63857 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ repos: hooks: - id: trailing-whitespace # Generated file - exclude: ^web/src/api/schema.d.ts|extra/.*$ + exclude: ^web/src/api/schema\.d\.ts|extra/.*$ - id: end-of-file-fixer exclude: Cargo.nix - id: detect-aws-credentials From ccf67edd75c55a804ef0afae284c846f469e7283 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 17 Jun 2024 20:40:58 +0200 Subject: [PATCH 6/9] chore(pre-commit): speed-up --- .pre-commit-config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 73f63857..6c89240f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -50,30 +50,35 @@ repos: hooks: - id: gen-man name: gen-man + files: ^rust/stackablectl/ language: system entry: cargo xtask gen-man stages: [commit, merge-commit, manual] pass_filenames: false - id: gen-comp name: gen-comp + files: ^rust/stackablectl/ language: system entry: cargo xtask gen-comp stages: [commit, merge-commit, manual] pass_filenames: false - id: gen-openapi name: gen-openapi + files: ^web/ language: system entry: cargo xtask gen-openapi stages: [commit, merge-commit, manual] pass_filenames: false - id: gen-ctl-readme name: gen-ctl-readme + files: ^rust/stackablectl/ language: system entry: cargo xtask gen-ctl-readme stages: [commit, merge-commit, manual] pass_filenames: false - id: gen-docs name: gen-docs + files: ^rust/stackablectl/ language: system entry: cargo xtask gen-docs stages: [commit, merge-commit, manual] From 5fab22d0b4cc6f2a974e808456b35a610b36044c Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 17 Jun 2024 20:47:30 +0200 Subject: [PATCH 7/9] chore(pre-commit): speed-up more --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6c89240f..8673ebe4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,6 @@ --- # See https://pre-commit.com for more information +fail_fast: true # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/pre-commit/pre-commit-hooks From e2a4d70bbd67375ff57f21ec40412bf7d233152a Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 18 Jun 2024 10:31:26 +0200 Subject: [PATCH 8/9] chore: mark gomod2nix.toml as generated --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index e0f76f82..74bc5051 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,3 +6,4 @@ Cargo.nix linguist-generated yarn.lock linguist-generated nix/** linguist-generated go.sum linguist-generated +gomod2nix.toml linguist-generated From c8f8aaac7a4c89236e5d5f1198b720be8fcb1b72 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 18 Jun 2024 11:01:26 +0200 Subject: [PATCH 9/9] Revert "chore: update generated ts def" This reverts commit dd89c0fb17b995a1f0ff029e9738946cf59c78ef. --- web/src/api/schema.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/src/api/schema.d.ts b/web/src/api/schema.d.ts index 2f72ee72..d3908c02 100644 --- a/web/src/api/schema.d.ts +++ b/web/src/api/schema.d.ts @@ -142,6 +142,8 @@ export interface components { pathItems: never; } +export type $defs = Record; + export type external = Record; export interface operations {