From 8509e0c425e66a6a9be13812d32332d95ba1188e Mon Sep 17 00:00:00 2001 From: Lasaro Date: Tue, 11 Apr 2023 10:06:15 -0300 Subject: [PATCH 1/2] Update govulncheck.yml (#685) Always use the latest go patch. (cherry picked from commit 82a0d66624c8299b0c5276a0ae5f0cd9681ba5e3) # Conflicts: # .github/workflows/govulncheck.yml --- .github/workflows/govulncheck.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index 15fbb98a110..d0107663652 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -16,7 +16,12 @@ jobs: steps: - uses: actions/setup-go@v4 with: +<<<<<<< HEAD go-version: "1.19.8" +======= + go-version: "1.20" + check-latest: true +>>>>>>> 82a0d6662 (Update govulncheck.yml (#685)) - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6 with: From 09de2c436496e1e36574b90022e2f45e1707e6e0 Mon Sep 17 00:00:00 2001 From: Lasaro Date: Tue, 11 Apr 2023 10:11:48 -0300 Subject: [PATCH 2/2] Use go 1.19 --- .github/workflows/govulncheck.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index d0107663652..e6c126cc1ee 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -16,12 +16,8 @@ jobs: steps: - uses: actions/setup-go@v4 with: -<<<<<<< HEAD - go-version: "1.19.8" -======= - go-version: "1.20" + go-version: "1.19" check-latest: true ->>>>>>> 82a0d6662 (Update govulncheck.yml (#685)) - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6 with: