Skip to content

Commit

Permalink
build: go v1.21.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmidyson committed Oct 16, 2023
1 parent 1107dfb commit b588f0f
Show file tree
Hide file tree
Showing 10 changed files with 188 additions and 20 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/checks-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ jobs:
NIX_USER_COUNT: 4

- name: Build
run: devbox run -- make SKIP_UPX=false build-snapshot
run: |
devbox run -- \
make GORELEASER_FLAGS=$'--config=<(env GOOS=$(shell go env GOOS) GOARCH=$(shell go env GOARCH) gojq --yaml-input --yaml-output \'del(.builds[0].goarch) | del(.builds[0].goos) | .builds[0].targets|=(["linux_amd64","linux_arm64",env.GOOS+"_"+env.GOARCH] | unique | map(. | sub("_amd64";"_amd64_v1")))\' .goreleaser.yml) --skip=validate,publish' release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
8 changes: 7 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ linters:
- errcheck
- errchkjson
- errname
- gocheckcompilerdirectives
- gochecknoinits
- gci
- ginkgolinter
- goconst
- gocritic
- gocyclo
Expand All @@ -25,18 +27,23 @@ linters:
- govet
- ineffassign
- lll
- loggercheck
- mirror
- misspell
- nolintlint
- prealloc
- reassign
- staticcheck
- stylecheck
- tenv
- testableexamples
- thelper
- tparallel
- typecheck
- unconvert
- unparam
- unused
- usestdlibvars
- whitespace

linters-settings:
Expand Down Expand Up @@ -66,7 +73,6 @@ linters-settings:
- performance
- style
gofumpt:
lang-version: "1.17"
extra-rules: true
lll:
line-length: 120
Expand Down
4 changes: 2 additions & 2 deletions devbox.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"packages": [
"[email protected]",
"bash@latest",
"coreutils@latest",
"crane@latest",
Expand All @@ -11,8 +10,9 @@
"gnused@latest",
"gnugrep@latest",
"gnumake@latest",
"go@latest",
"gojq@latest",
"golangci-lint@latest",
"path:./hack/flakes/golangci-lint",
"golines@latest",
"goreleaser@latest",
"gotestsum@latest",
Expand Down
48 changes: 35 additions & 13 deletions devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,32 @@
"source": "devbox-search",
"version": "4.9"
},
"go@1.20.5": {
"last_modified": "2023-06-30T04:44:22Z",
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#go",
"go@latest": {
"last_modified": "2023-09-27T18:02:17Z",
"resolved": "github:NixOS/nixpkgs/517501bcf14ae6ec47efd6a17dda0ca8e6d866f9#go_1_21",
"source": "devbox-search",
"version": "1.20.5"
"version": "1.21.1",
"systems": {
"aarch64-darwin": {
"store_path": "/nix/store/s1xk6hrfn0kw8ycvqbx4vv4gr00k6qpl-go-1.21.1"
},
"aarch64-linux": {
"store_path": "/nix/store/id3ygqxp1hvbh7dyjlwngx53fvcpqg84-go-1.21.1"
},
"x86_64-darwin": {
"store_path": "/nix/store/yn0g820ayb963s0i4nnw9pf72l49kkg0-go-1.21.1"
},
"x86_64-linux": {
"store_path": "/nix/store/pvvv2lmx9m8b2n0447mljrl5xmla8r3h-go-1.21.1"
}
}
},
"gojq@latest": {
"last_modified": "2023-06-29T16:20:38Z",
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#gojq",
"source": "devbox-search",
"version": "0.12.13"
},
"golangci-lint@latest": {
"last_modified": "2023-06-29T16:20:38Z",
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#golangci-lint",
"source": "devbox-search",
"version": "1.53.3"
},
"golines@latest": {
"last_modified": "2023-05-07T06:59:10Z",
"resolved": "github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389#golines",
Expand Down Expand Up @@ -124,10 +132,24 @@
"version": "3.7.0"
},
"upx@latest": {
"last_modified": "2023-05-07T06:59:10Z",
"resolved": "github:NixOS/nixpkgs/eb751d65225ec53de9cf3d88acbf08d275882389#upx",
"last_modified": "2023-09-27T18:02:17Z",
"resolved": "github:NixOS/nixpkgs/517501bcf14ae6ec47efd6a17dda0ca8e6d866f9#upx",
"source": "devbox-search",
"version": "4.0.2"
"version": "4.1.0",
"systems": {
"aarch64-darwin": {
"store_path": "/nix/store/ikinay856hs3859fznlgwfpddyr9x4vd-upx-4.1.0"
},
"aarch64-linux": {
"store_path": "/nix/store/bq0ph6zndc6b99ms6xdqs7smxwi7h92d-upx-4.1.0"
},
"x86_64-darwin": {
"store_path": "/nix/store/n53b9qf3b977ag2zrlyq7ai26qc8wj06-upx-4.1.0"
},
"x86_64-linux": {
"store_path": "/nix/store/89c1i9vrs0l5nqyr9hfcbwyd5cwfpqr2-upx-4.1.0"
}
}
}
}
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

module github.com/mesosphere/mindthegap

go 1.20
go 1.21

require (
github.com/aws/aws-sdk-go-v2 v1.21.2
Expand Down
Loading

0 comments on commit b588f0f

Please sign in to comment.