Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v6.5.0
uses: actions/setup-go@v7.0.0
with:
go-version: ${{ matrix.go }}
cache: false

- name: Checkout
uses: actions/checkout@v7.0.0
uses: actions/checkout@v7.0.1
with:
path: ${{env.SRC_DIR}}

Expand Down Expand Up @@ -91,13 +91,13 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v6.5.0
uses: actions/setup-go@v7.0.0
with:
go-version: ${{ matrix.go }}
cache: false

- name: Checkout
uses: actions/checkout@v7.0.0
uses: actions/checkout@v7.0.1
with:
path: ${{env.SRC_DIR}}

Expand Down Expand Up @@ -148,13 +148,13 @@ jobs:

steps:
- name: Set up Go
uses: actions/setup-go@v6.5.0
uses: actions/setup-go@v7.0.0
with:
go-version: ${{ matrix.go }}
cache: false

- name: Checkout
uses: actions/checkout@v7.0.0
uses: actions/checkout@v7.0.1
with:
path: ${{env.SRC_DIR}}

Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v7.0.0
uses: actions/checkout@v7.0.1

- name: Check spelling
continue-on-error: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v7.0.0
uses: actions/checkout@v7.0.1
with:
fetch-depth: 2

- name: Initialize CodeQL
uses: github/codeql-action/init@v4.37.0
uses: github/codeql-action/init@v4.37.8
with:
languages: go

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v4.37.0
uses: github/codeql-action/analyze@v4.37.8
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Changelog

### [14.4.3](https://kaos.sh/ek/14.4.3)

- **`[req]`** Retrier now returns the last response if all attempts are failed

### [14.4.2](https://kaos.sh/ek/14.4.2)

- **`[support]`** Updated symbol of skipped check
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/essentialkaos/check v1.4.1
github.com/essentialkaos/depsy v1.3.1
github.com/essentialkaos/go-linenoise/v3 v3.7.0
golang.org/x/crypto v0.54.0
golang.org/x/crypto v0.55.0
golang.org/x/sys v0.47.0
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.15.0 h1:D0RCU5rMAp+SpgkiNdrjfJ+LX4J1M32V2NeCY7EJ6hc=
github.com/rogpeppe/go-internal v1.15.0/go.mod h1:DrUVZyrJU+txYW5/1kwtXQSMFio52ZOxX7yM1VHvnxs=
golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw=
golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=
golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M=
golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis=
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
2 changes: 1 addition & 1 deletion jsonutil/jsonutil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (s *JSONSuite) TestEncoding(c *C) {
"linux": `open /test.json: permission denied`,
})

err = Write(jsonFile, map[float64]int{3.14: 123})
err = Write(jsonFile, map[bool]int{false: 123})

c.Assert(err, NotNil)
}
Expand Down
7 changes: 4 additions & 3 deletions req/retrier.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,11 @@ func (rt *Retrier) doRequest(method string, r Request, rr Retry) (*Response, err
return nil, ErrNilEngine
}

var lastErr error
var resp *Response
var err, lastErr error

for range rr.Num {
resp, err := rt.e.doRequest(r, method)
resp, err = rt.e.doRequest(r, method)

if err != nil {
lastErr = err
Expand Down Expand Up @@ -149,7 +150,7 @@ func (rt *Retrier) doRequest(method string, r Request, rr Retry) (*Response, err
}
}

return nil, lastErr
return resp, lastErr
}

// getRetryPause returns pause between requests
Expand Down
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ package ek
// ////////////////////////////////////////////////////////////////////////////////// //

// VERSION is current ek package version
const VERSION = "14.4.2"
const VERSION = "14.4.3"
Loading