Skip to content

Commit

Permalink
Merge pull request #16 from ConductorOne/mchavez-fix-goreleaser
Browse files Browse the repository at this point in the history
Update go version in tests. Fix goreleaser.
  • Loading branch information
ggreer authored Jul 16, 2024
2 parents 556e7c8 + 34c8b5c commit 7d3d137
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ jobs:
p12-file-base64: ${{ secrets.APPLE_SIGNING_KEY_P12 }}
p12-password: ${{ secrets.APPLE_SIGNING_KEY_P12_PASSWORD }}
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v4
uses: goreleaser/goreleaser-action@v6
with:
version: latest
version: "~> v2"
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}
Expand All @@ -53,9 +53,9 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v4
uses: goreleaser/goreleaser-action@v6
with:
version: latest
version: "~> v2"
args: release --clean -f .goreleaser.docker.yaml
env:
GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}
3 changes: 2 additions & 1 deletion .goreleaser.docker.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version: 2
project_name: baton-snipe-it
builds:
- binary: baton-snipe-it
Expand Down Expand Up @@ -51,4 +52,4 @@ checksum:
release:
disable: true
changelog:
skip: true
disable: true
5 changes: 3 additions & 2 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version: 2
project_name: baton-snipe-it
builds:
- binary: baton-snipe-it
Expand Down Expand Up @@ -65,10 +66,10 @@ checksum:
- glob: ./dist/*-darwin-amd64.zip
- glob: ./dist/*-darwin-arm64.zip
brews:
- tap:
- repository:
owner: conductorone
name: homebrew-baton
folder: Formula
directory: Formula
homepage: https://conductorone.com
test: |
system "#{bin}/baton-snipe-it -v"
Expand Down
2 changes: 1 addition & 1 deletion pkg/snipe-it/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (c *Client) Validate(ctx context.Context) error {
res, err := c.Do(req)
if err != nil {
baseUrl := strings.TrimSuffix(c.baseUrl, "/")
if res.StatusCode == 404 && strings.HasSuffix(baseUrl, "api/v1") {
if res.StatusCode == http.StatusNotFound && strings.HasSuffix(baseUrl, "api/v1") {
c.baseUrl = strings.TrimSuffix(baseUrl, "api/v1")
return c.Validate(ctx)
}
Expand Down

0 comments on commit 7d3d137

Please sign in to comment.