From 6e32d5c1d2cc73747feee2f2b4cd171d2cefb74a Mon Sep 17 00:00:00 2001 From: Integralist Date: Wed, 29 Mar 2023 08:52:07 +0100 Subject: [PATCH 1/2] build(deps): bump tinygo baseline version --- .fastly/config.toml | 12 ++++++------ pkg/commands/compute/build_test.go | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.fastly/config.toml b/.fastly/config.toml index 7a18a7a05..e1eb27614 100644 --- a/.fastly/config.toml +++ b/.fastly/config.toml @@ -4,13 +4,13 @@ config_version = 2 api_endpoint = "https://api.fastly.com" [language] - [language.go] - tinygo_constraint = ">= 0.24.0-0" # NOTE -0 indicates to the CLI's semver package that we accept pre-releases (TinyGo users commonly use pre-releases). - toolchain_constraint = ">= 1.17" +[language.go] +tinygo_constraint = ">= 0.26.0-0" # NOTE -0 indicates to the CLI's semver package that we accept pre-releases (TinyGo users commonly use pre-releases). +toolchain_constraint = ">= 1.17" - [language.rust] - toolchain_constraint = ">= 1.56.1" - wasm_wasi_target = "wasm32-wasi" +[language.rust] +toolchain_constraint = ">= 1.56.1" +wasm_wasi_target = "wasm32-wasi" [viceroy] ttl = "24h" diff --git a/pkg/commands/compute/build_test.go b/pkg/commands/compute/build_test.go index 75bda30aa..eeba60b58 100644 --- a/pkg/commands/compute/build_test.go +++ b/pkg/commands/compute/build_test.go @@ -254,7 +254,7 @@ func TestBuildGo(t *testing.T) { applicationConfig: config.File{ Language: config.Language{ Go: config.Go{ - TinyGoConstraint: ">= 0.24.0-0", + TinyGoConstraint: ">= 0.26.0-0", ToolchainConstraint: ">= 1.17", }, }, @@ -275,7 +275,7 @@ func TestBuildGo(t *testing.T) { applicationConfig: config.File{ Language: config.Language{ Go: config.Go{ - TinyGoConstraint: ">= 0.24.0-0", + TinyGoConstraint: ">= 0.26.0-0", ToolchainConstraint: ">= 1.17", }, }, @@ -296,7 +296,7 @@ func TestBuildGo(t *testing.T) { applicationConfig: config.File{ Language: config.Language{ Go: config.Go{ - TinyGoConstraint: ">= 0.24.0-0", + TinyGoConstraint: ">= 0.26.0-0", ToolchainConstraint: ">= 1.17", }, }, From a769cef1ec87c382ae2fb0d9bad18d7dd9024633 Mon Sep 17 00:00:00 2001 From: Integralist Date: Wed, 29 Mar 2023 10:07:51 +0100 Subject: [PATCH 2/2] docs(make): ignore staticcheck via line directive --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8ebb877c2..8c22dafae 100644 --- a/Makefile +++ b/Makefile @@ -101,6 +101,7 @@ semgrep: if command -v semgrep &> /dev/null; then semgrep ci --config auto --exclude-rule go.lang.security.audit.xss.import-text-template.import-text-template $(SEMGREP_ARGS); fi # Run third-party static analysis. +# To ignore lines use: //lint:ignore .PHONY: staticcheck staticcheck: staticcheck ./{cmd,pkg}/...