From 47068760a1c0de15505e1e440dbc972ac42f8fd3 Mon Sep 17 00:00:00 2001 From: Mostyn Bramley-Moore Date: Sat, 5 Aug 2023 20:13:53 +0200 Subject: [PATCH 1/2] Upgrade to go 1.20.7 --- .bazelci/buildkite-install-go.sh | 2 +- .github/workflows/golangci-lint.yml | 2 +- WORKSPACE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bazelci/buildkite-install-go.sh b/.bazelci/buildkite-install-go.sh index b4f99f6ba..a2232c087 100755 --- a/.bazelci/buildkite-install-go.sh +++ b/.bazelci/buildkite-install-go.sh @@ -2,7 +2,7 @@ set -euo pipefail -pkg=go1.20.6.linux-amd64.tar.gz +pkg=go1.20.7.linux-amd64.tar.gz wget -o "$HOME/$pkg" "https://golang.org/dl/$pkg" 1>&2 tar -xv -C "$HOME" -f "$pkg" 1>&2 diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 02d941a0a..e680a5395 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: '1.20.6' + go-version: '1.20.7' - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 diff --git a/WORKSPACE b/WORKSPACE index e35c306a5..bdbd8d33e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -22,7 +22,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe go_rules_dependencies() -go_register_toolchains(version = "1.20.6") +go_register_toolchains(version = "1.20.7") http_archive( name = "rules_proto", From 958bf84344366b5cf4b359cb839c7bce013b44b8 Mon Sep 17 00:00:00 2001 From: Mostyn Bramley-Moore Date: Sat, 5 Aug 2023 20:22:40 +0200 Subject: [PATCH 2/2] golangci-lint: increase timeout --- .github/workflows/golangci-lint.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index e680a5395..dd33806e2 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -19,3 +19,4 @@ jobs: uses: golangci/golangci-lint-action@v3 with: version: latest + args: --timeout=10m