diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 459318737634..7be4d7168f0b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -36,7 +36,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11 + uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0 # Override language selection by uncommenting this and choosing your languages # with: # languages: go, javascript, csharp, python, cpp, java @@ -46,4 +46,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11 + uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 143744c9ef8e..82b391e77818 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -49,6 +49,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # tag=v3.29.11 + uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # tag=v3.30.0 with: sarif_file: results.sarif diff --git a/pkg/cio/io.go b/pkg/cio/io.go index 9e982cb0a9f5..d04dcc871d66 100644 --- a/pkg/cio/io.go +++ b/pkg/cio/io.go @@ -18,6 +18,7 @@ package cio import ( "context" + "errors" "fmt" "io" "net/url" @@ -205,16 +206,16 @@ func (c *cio) Wait() { } func (c *cio) Close() error { - var lastErr error + var errs []error for _, closer := range c.closers { if closer == nil { continue } if err := closer.Close(); err != nil { - lastErr = err + errs = append(errs, err) } } - return lastErr + return errors.Join(errs...) } func (c *cio) Cancel() {