Skip to content

Commit

Permalink
Merge pull request #19 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 0.3.1
  • Loading branch information
andyone authored Dec 4, 2024
2 parents ee38a96 + f9b1ab4 commit 4e4dad1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################

# This Makefile generated by GoMakeGen 3.2.1 using next command:
# This Makefile generated by GoMakeGen 3.2.3 using next command:
# gomakegen --mod .
#
# More info: https://kaos.sh/gomakegen
Expand Down Expand Up @@ -48,19 +48,22 @@ else
endif

mod-init:
@echo "[1/2] Modules initialization…"
@echo "[1/3] Modules initialization…"
@rm -f go.mod go.sum
ifdef MODULE_PATH ## Module path for initialization (String)
@go mod init $(MODULE_PATH)
else
@go mod init
endif

@echo "[37m[2/2][0m [36;1mDependencies cleanup…[0m"
@echo "[37m[2/3][0m [36;1mDependencies cleanup…[0m"
ifdef COMPAT ## Compatible Go version (String)
@go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) -go=$(COMPAT)
else
@go mod tidy $(VERBOSE_FLAG)
endif
@echo "[3/3] Stripping toolchain info…"
@grep -q 'toolchain ' go.mod && go mod edit -toolchain=none || :

mod-update:
@echo "[1/4] Updating dependencies…"
Expand Down Expand Up @@ -109,6 +112,6 @@ help: ## Show this info
| sort -h \
| awk 'BEGIN {FS = " .*?## "}; {printf " \033[32m%-13s\033[0m %s\n", $$1, $$2}'
@echo -e ''
@echo -e '\033[90mGenerated by GoMakeGen 3.2.1\033[0m\n'
@echo -e '\033[90mGenerated by GoMakeGen 3.2.3\033[0m\n'

################################################################################
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.8

require (
github.com/essentialkaos/check v1.4.1
github.com/essentialkaos/ek/v13 v13.12.0
github.com/essentialkaos/ek/v13 v13.14.0
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/essentialkaos/check v1.4.1 h1:SuxXzrbokPGTPWxGRnzy0hXvtb44mtVrdNxgPa1s4c8=
github.com/essentialkaos/check v1.4.1/go.mod h1:xQOYwFvnxfVZyt5Qvjoa1SxcRqu5VyP77pgALr3iu+M=
github.com/essentialkaos/ek/v13 v13.12.0 h1:NV5pZWzD2vIMBDoTihAwFRoLuN2xV6ie47unhS/H8nc=
github.com/essentialkaos/ek/v13 v13.12.0/go.mod h1:GAoS44v5gtd3Yc1qqfgXsaJNoC0dMw1ueW5Fc9TTHUg=
github.com/essentialkaos/ek/v13 v13.14.0 h1:kBpA6r5wZxi09ND5vmlzpe9kvjfWSJ4AywBJM8Oq1ME=
github.com/essentialkaos/ek/v13 v13.14.0/go.mod h1:GAoS44v5gtd3Yc1qqfgXsaJNoC0dMw1ueW5Fc9TTHUg=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
Expand Down
4 changes: 2 additions & 2 deletions pachca.go
Original file line number Diff line number Diff line change
Expand Up @@ -1628,12 +1628,12 @@ func (c *Client) UploadFile(file string) (*File, error) {
},
)

defer resp.Body.Close()

if err != nil {
return nil, fmt.Errorf("Can't upload file %q data: %w", file, err)
}

defer resp.Body.Close()

if resp.StatusCode >= 400 {
return nil, fmt.Errorf(
"Can't upload file %q data: %w",
Expand Down

0 comments on commit 4e4dad1

Please sign in to comment.