Skip to content

Commit

Permalink
Merge pull request #24 from ConductorOne/lauren/fix-goreleaser-and-li…
Browse files Browse the repository at this point in the history
…nter

Fix macos arm release and lint error
  • Loading branch information
ggreer authored Nov 22, 2024
2 parents d11d19b + 1ad48c7 commit 15a0fa4
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ linters:
- bodyclose # checks whether HTTP response body is closed successfully
- durationcheck # check for two durations multiplied together
- errorlint # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13.
- execinquery # execinquery is a linter about query string checker in Query function which reads your Go src files and warning it finds
- exhaustive # check exhaustiveness of enum switch statements
- exportloopref # checks for pointers to enclosing loop variables
- forbidigo # Forbids identifiers
Expand Down
2 changes: 1 addition & 1 deletion .gon-arm64.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"source": ["./dist/macos-arm64_darwin_arm64/baton-servicenow"],
"source": ["./dist/macos-arm64_darwin_arm64_v8.0/baton-servicenow"],
"bundle_id": "com.conductorone.baton-servicenow",
"apple_id": {
"username" : "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ builds:
hooks:
post:
- gon .gon-arm64.json
- mv dist/baton-servicenow-darwin-arm64.signed.zip dist/macos-arm64_darwin_arm64/baton-servicenow
- mv dist/baton-servicenow-darwin-arm64.signed.zip dist/macos-arm64_darwin_arm64_v8.0/baton-servicenow
archives:
- id: linux-archive
builds:
Expand Down
1 change: 0 additions & 1 deletion pkg/servicenow/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,6 @@ func (c *Client) doRequest(ctx context.Context, urlAddress string, method string
}

if rawResponse.StatusCode >= 300 {
//nolint:gosec // we check for overflow above
return "", status.Error(codes.Code(uint32(rawResponse.StatusCode)), "Request failed")
}

Expand Down

0 comments on commit 15a0fa4

Please sign in to comment.