From 705927b65715d9636cfe6d53e7c68f3d3c162f3e Mon Sep 17 00:00:00 2001 From: Marco Antonio Blanco Date: Wed, 8 Nov 2023 16:11:15 +0100 Subject: [PATCH 1/9] Bump up jq version to support arm64 architecture --- .tool-versions | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.tool-versions b/.tool-versions index 806ed3ef9..504cae0d1 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,13 +1,13 @@ argocd 2.9.0 -eksctl 0.151.0 awscli 2.13.32 +eksctl 0.151.0 +gcloud 445.0.0 golang 1.21.3 golangci-lint 1.55.2 -jq 1.6 helm 3.13.1 +initium 0.5.0 +jq 1.7 kind 0.17.0 kubectl 1.27.4 pre-commit 3.5.0 tilt 0.33.3 -gcloud 445.0.0 -initium 0.5.0 From deb543db4caf2b1ace94c76db5f71e1b096fb173 Mon Sep 17 00:00:00 2001 From: Marco Antonio Blanco Date: Fri, 10 Nov 2023 13:17:17 +0100 Subject: [PATCH 2/9] Update versions --- .tool-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.tool-versions b/.tool-versions index 504cae0d1..c9252581e 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,10 +1,10 @@ argocd 2.9.0 -awscli 2.13.32 +awscli 2.13.33 eksctl 0.151.0 gcloud 445.0.0 -golang 1.21.3 +golang 1.21.4 golangci-lint 1.55.2 -helm 3.13.1 +helm 3.13.2 initium 0.5.0 jq 1.7 kind 0.17.0 From 019c5bb3e0f2ff813d9015022dde20b8b32f19ef Mon Sep 17 00:00:00 2001 From: Marco Antonio Blanco Date: Mon, 13 Nov 2023 16:07:54 +0100 Subject: [PATCH 3/9] Test --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index c9252581e..dd43f8ab7 100644 --- a/.tool-versions +++ b/.tool-versions @@ -6,7 +6,7 @@ golang 1.21.4 golangci-lint 1.55.2 helm 3.13.2 initium 0.5.0 -jq 1.7 +jq 1.6 kind 0.17.0 kubectl 1.27.4 pre-commit 3.5.0 From 22672f4bf55b0eb1a4e4defe9b3dc5f3d91b796a Mon Sep 17 00:00:00 2001 From: Marco Antonio Blanco Date: Mon, 13 Nov 2023 16:21:23 +0100 Subject: [PATCH 4/9] End of test --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 39d48fda3..b1ee1ded0 100644 --- a/.tool-versions +++ b/.tool-versions @@ -5,7 +5,7 @@ golang 1.21.4 golangci-lint 1.55.2 helm 3.13.2 initium 0.5.0 -jq 1.6 +jq 1.7 kind 0.17.0 kubectl 1.27.4 pre-commit 3.5.0 From 4f96f67ef2281907480623a49b67fd03a4e1ea0a Mon Sep 17 00:00:00 2001 From: Marco Antonio Blanco Date: Mon, 13 Nov 2023 16:26:28 +0100 Subject: [PATCH 5/9] Add missing tool --- .tool-versions | 1 + 1 file changed, 1 insertion(+) diff --git a/.tool-versions b/.tool-versions index b1ee1ded0..46315d1c1 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,5 +1,6 @@ argocd 2.9.0 awscli 2.13.34 +eksctl 0.151.0 gcloud 445.0.0 golang 1.21.4 golangci-lint 1.55.2 From 3545fccc9ea6fd4633cdb2d9af63b790a7983779 Mon Sep 17 00:00:00 2001 From: Marco Antonio Blanco Date: Mon, 13 Nov 2023 16:31:07 +0100 Subject: [PATCH 6/9] Verbose tools installation (debug) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 388d081e6..7520fbd1a 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ plugin_uninstall: ## uninstall asdf plugins @asdf plugin remove initium || true asdf_install: plugin_install ## install all plugins and packages present in .tool-versions file - @asdf install + asdf install asdf_uninstall: plugin_uninstall ## uninstall all plugins and packages present in .tool-versions file From 5eb2e1e6567715a35cf0469f9abac94e8a554552 Mon Sep 17 00:00:00 2001 From: Marco Antonio Blanco Date: Mon, 13 Nov 2023 16:36:38 +0100 Subject: [PATCH 7/9] End debug --- .tool-versions | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.tool-versions b/.tool-versions index 46315d1c1..b7160b2cf 100644 --- a/.tool-versions +++ b/.tool-versions @@ -6,7 +6,7 @@ golang 1.21.4 golangci-lint 1.55.2 helm 3.13.2 initium 0.5.0 -jq 1.7 +jq 1.6 kind 0.17.0 kubectl 1.27.4 pre-commit 3.5.0 diff --git a/Makefile b/Makefile index 7520fbd1a..388d081e6 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ plugin_uninstall: ## uninstall asdf plugins @asdf plugin remove initium || true asdf_install: plugin_install ## install all plugins and packages present in .tool-versions file - asdf install + @asdf install asdf_uninstall: plugin_uninstall ## uninstall all plugins and packages present in .tool-versions file From f94c23fba30284b2e4cfa81a0a15b0ffe7a2fddc Mon Sep 17 00:00:00 2001 From: Marco Antonio Blanco Date: Mon, 13 Nov 2023 21:17:31 +0000 Subject: [PATCH 8/9] Check for jq 1.7 --- .github/workflows/static-checks.yml | 2 +- .tool-versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml index cd00e9275..2646bf6b9 100644 --- a/.github/workflows/static-checks.yml +++ b/.github/workflows/static-checks.yml @@ -15,7 +15,7 @@ jobs: - name: Static check run: | # Install asdf and expose to PATH - git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.10.2 + git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.13.1 . $HOME/.asdf/asdf.sh # Add asdf plugins and install tools in .tool-versions make asdf_install diff --git a/.tool-versions b/.tool-versions index b7160b2cf..46315d1c1 100644 --- a/.tool-versions +++ b/.tool-versions @@ -6,7 +6,7 @@ golang 1.21.4 golangci-lint 1.55.2 helm 3.13.2 initium 0.5.0 -jq 1.6 +jq 1.7 kind 0.17.0 kubectl 1.27.4 pre-commit 3.5.0 From 7a09ce71180d1c9ec2c1d8b854188bd4f37ab037 Mon Sep 17 00:00:00 2001 From: Marco Antonio Blanco Date: Mon, 13 Nov 2023 22:00:34 +0000 Subject: [PATCH 9/9] Keep jq at v1.6 --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 46315d1c1..b7160b2cf 100644 --- a/.tool-versions +++ b/.tool-versions @@ -6,7 +6,7 @@ golang 1.21.4 golangci-lint 1.55.2 helm 3.13.2 initium 0.5.0 -jq 1.7 +jq 1.6 kind 0.17.0 kubectl 1.27.4 pre-commit 3.5.0