From d9a21295b0d304030a9cc33e4b25804565fd43d9 Mon Sep 17 00:00:00 2001 From: coury-clark Date: Wed, 5 Apr 2023 12:34:54 -0700 Subject: [PATCH] backport 50341 to 5.0 (#50404) Fixing accidentally missed backport ## Test plan N/A --------- Co-authored-by: Vincent --- .github/workflows/sg-setup.yml | 2 +- .tool-versions | 2 +- WORKSPACE | 2 +- cmd/symbols/Dockerfile | 2 +- dev/build-tracker/Dockerfile | 2 +- dev/ci/integration/code-intel/install-src.sh | 4 ++-- dev/sg/checks.go | 4 ++-- docker-images/opentelemetry-collector/Dockerfile | 2 +- internal/cmd/git-combine/Dockerfile | 2 +- internal/cmd/progress-bot/Dockerfile | 2 +- internal/cmd/search-blitz/Dockerfile | 2 +- internal/cmd/tracking-issue/Dockerfile | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/sg-setup.yml b/.github/workflows/sg-setup.yml index a8eb0004da472..986bd84052348 100644 --- a/.github/workflows/sg-setup.yml +++ b/.github/workflows/sg-setup.yml @@ -24,7 +24,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.19.6 + go-version: 1.19.8 - name: Install asdf plugins uses: asdf-vm/actions/install@v1 diff --git a/.tool-versions b/.tool-versions index ae6c4ab890f3c..6d22fce098658 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ -golang 1.19.6 +golang 1.19.8 nodejs 16.18.1 fd 8.6.0 shfmt 3.5.0 diff --git a/WORKSPACE b/WORKSPACE index 122bb7d8373a0..3ae9c4eef96c5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -212,7 +212,7 @@ go_rules_dependencies() go_register_toolchains( nogo = "@//:sg_nogo", - version = "1.19.6", + version = "1.19.8", ) linter_dependencies() diff --git a/cmd/symbols/Dockerfile b/cmd/symbols/Dockerfile index 4e13ef340f2a8..87ce5682e9a63 100644 --- a/cmd/symbols/Dockerfile +++ b/cmd/symbols/Dockerfile @@ -6,7 +6,7 @@ USER root COPY cmd/symbols/ctags-install-alpine.sh /ctags-install-alpine.sh RUN /ctags-install-alpine.sh -FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS symbols-build +FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS symbols-build # hadolint ignore=DL3002 USER root diff --git a/dev/build-tracker/Dockerfile b/dev/build-tracker/Dockerfile index 7315860dcafab..4c91b5247d538 100644 --- a/dev/build-tracker/Dockerfile +++ b/dev/build-tracker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS build-tracker-build +FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS build-tracker-build ENV GO111MODULE on ENV GOARCH amd64 diff --git a/dev/ci/integration/code-intel/install-src.sh b/dev/ci/integration/code-intel/install-src.sh index 7645aba98c07b..f29f096c5e9c3 100755 --- a/dev/ci/integration/code-intel/install-src.sh +++ b/dev/ci/integration/code-intel/install-src.sh @@ -8,8 +8,8 @@ set -eux cd "$(dirname "${BASH_SOURCE[0]}")/../../../.." root_dir="$(pwd)" -# By default, version of src-cli that builds with 1.19.6 -VERSION=${1:-'85115b1a8a2e1bc174075eefacbae6ad9d19af1f'} +# By default, version of src-cli that builds with 1.19.8 +VERSION=${1:-'58b3f701691cbdbd10b54161d9bfca88b781480d'} TEMP=$(mktemp -d -t sgdockerbuild_XXXXXXX) cleanup() { diff --git a/dev/sg/checks.go b/dev/sg/checks.go index 4810833ec5c4d..245b795f31678 100644 --- a/dev/sg/checks.go +++ b/dev/sg/checks.go @@ -33,8 +33,8 @@ var checks = map[string]check.CheckFunc{ "caddy-trusted": checkCaddyTrusted, "asdf": check.CommandOutputContains("asdf", "version"), "git": check.Combine(check.InPath("git"), checkGitVersion(">= 2.34.1")), - "pnpm": check.Combine(check.InPath("pnpm"), checkPnpmVersion(">= 7.24.2")), - "go": check.Combine(check.InPath("go"), checkGoVersion("~> 1.19.6")), + "pnpm": check.Combine(check.InPath("pnpm"), checkPnpmVersion(">= 7.28.0")), + "go": check.Combine(check.InPath("go"), checkGoVersion("~> 1.19.8")), "node": check.Combine(check.InPath("node"), check.CommandOutputContains(`node -e "console.log(\"foobar\")"`, "foobar")), "rust": check.Combine(check.InPath("cargo"), check.CommandOutputContains(`cargo version`, "1.58.0")), "docker-installed": check.WrapErrMessage(check.InPath("docker"), "if Docker is installed and the check fails, you might need to start Docker.app and restart terminal and 'sg setup'"), diff --git a/docker-images/opentelemetry-collector/Dockerfile b/docker-images/opentelemetry-collector/Dockerfile index 282a73d621ef2..2ba5698d9d19f 100644 --- a/docker-images/opentelemetry-collector/Dockerfile +++ b/docker-images/opentelemetry-collector/Dockerfile @@ -1,5 +1,5 @@ # Build custom collector binary -FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS build +FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS build ARG OTEL_COLLECTOR_VERSION ENV OTEL_COLLECTOR_VERSION=${OTEL_COLLECTOR_VERSION} diff --git a/internal/cmd/git-combine/Dockerfile b/internal/cmd/git-combine/Dockerfile index 9a75d96067e03..766fc3df04f12 100644 --- a/internal/cmd/git-combine/Dockerfile +++ b/internal/cmd/git-combine/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS builder +FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS builder WORKDIR /go/src/app diff --git a/internal/cmd/progress-bot/Dockerfile b/internal/cmd/progress-bot/Dockerfile index 2d13a91f55189..a59b93cc6f3d4 100644 --- a/internal/cmd/progress-bot/Dockerfile +++ b/internal/cmd/progress-bot/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS builder +FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS builder WORKDIR /go/src/progress-bot diff --git a/internal/cmd/search-blitz/Dockerfile b/internal/cmd/search-blitz/Dockerfile index 550ed54f6a7d6..def6936aa23ca 100644 --- a/internal/cmd/search-blitz/Dockerfile +++ b/internal/cmd/search-blitz/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS builder +FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS builder WORKDIR /build COPY go.sum go.mod ./ COPY . . diff --git a/internal/cmd/tracking-issue/Dockerfile b/internal/cmd/tracking-issue/Dockerfile index a14acbf2d8dc6..1e8797f5ee345 100644 --- a/internal/cmd/tracking-issue/Dockerfile +++ b/internal/cmd/tracking-issue/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS builder +FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS builder WORKDIR /go/src/tracking-issue COPY . .