Skip to content

Commit

Permalink
Merge pull request #6992 from TheThingsNetwork/feature/remove-tools-deps
Browse files Browse the repository at this point in the history
Update developer tooling
  • Loading branch information
adriansmares authored Mar 12, 2024
2 parents ad25a35 + 223c26f commit e9e18b6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 32 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ jobs:
- name: Check for diff
run: tools/bin/mage git:diff
- name: Lint code
uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804
uses: golangci/golangci-lint-action@v4
with:
version: v1.55.2
version: v1.56.2
only-new-issues: true
skip-pkg-cache: true # Caching is set up by install-go-and-deps
skip-build-cache: true # Caching is set up by install-go-and-deps
Expand Down
1 change: 0 additions & 1 deletion cmd/ttn-lw-stack/commands/is_db_create_oauth_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ var createOAuthClient = &cobra.Command{
}
return nil
})

if err != nil {
return err
}
Expand Down
19 changes: 0 additions & 19 deletions tools/mage/env.go

This file was deleted.

16 changes: 6 additions & 10 deletions tools/mage/go.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,15 @@ import (
// Go namespace.
type Go mg.Namespace

var minGoVersion = "1.11.4"

var goModuleEnv = map[string]string{
"GO111MODULE": "on",
}
var minGoVersion = "1.21.0"

var goTags = os.Getenv("GO_TAGS")

const (
gofumpt = "mvdan.cc/gofumpt@v0.4.0"
golangciLint = "github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1"
goveralls = "github.com/mattn/[email protected].11"
bufCLI = "github.com/bufbuild/buf/cmd/buf@v1.25.1"
gofumpt = "mvdan.cc/gofumpt@v0.6.0"
golangciLint = "github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2"
goveralls = "github.com/mattn/[email protected].12"
bufCLI = "github.com/bufbuild/buf/cmd/buf@v1.30.0"
)

func buildGoArgs(cmd string, args ...string) []string {
Expand All @@ -53,7 +49,7 @@ func buildGoArgs(cmd string, args ...string) []string {
}

func execGoFrom(dir string, stdout, stderr io.Writer, cmd string, args ...string) error {
return execFrom(dir, goModuleEnv, stdout, stderr, "go", buildGoArgs(cmd, args...)...)
return execFrom(dir, nil, stdout, stderr, "go", buildGoArgs(cmd, args...)...)
}

func execGo(stdout, stderr io.Writer, cmd string, args ...string) error {
Expand Down

0 comments on commit e9e18b6

Please sign in to comment.