Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit d9a2129

Browse files
coury-clarkevict
andauthored
backport 50341 to 5.0 (#50404)
Fixing accidentally missed backport ## Test plan N/A <!-- All pull requests REQUIRE a test plan: https://docs.sourcegraph.com/dev/background-information/testing_principles --> --------- Co-authored-by: Vincent <[email protected]>
1 parent d7ffaf0 commit d9a2129

File tree

12 files changed

+14
-14
lines changed

12 files changed

+14
-14
lines changed

.github/workflows/sg-setup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install Go
2525
uses: actions/setup-go@v2
2626
with:
27-
go-version: 1.19.6
27+
go-version: 1.19.8
2828

2929
- name: Install asdf plugins
3030
uses: asdf-vm/actions/install@v1

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
golang 1.19.6
1+
golang 1.19.8
22
nodejs 16.18.1
33
fd 8.6.0
44
shfmt 3.5.0

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ go_rules_dependencies()
212212

213213
go_register_toolchains(
214214
nogo = "@//:sg_nogo",
215-
version = "1.19.6",
215+
version = "1.19.8",
216216
)
217217

218218
linter_dependencies()

cmd/symbols/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ USER root
66
COPY cmd/symbols/ctags-install-alpine.sh /ctags-install-alpine.sh
77
RUN /ctags-install-alpine.sh
88

9-
FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS symbols-build
9+
FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS symbols-build
1010
# hadolint ignore=DL3002
1111
USER root
1212

dev/build-tracker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS build-tracker-build
1+
FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS build-tracker-build
22

33
ENV GO111MODULE on
44
ENV GOARCH amd64

dev/ci/integration/code-intel/install-src.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ set -eux
88
cd "$(dirname "${BASH_SOURCE[0]}")/../../../.."
99
root_dir="$(pwd)"
1010

11-
# By default, version of src-cli that builds with 1.19.6
12-
VERSION=${1:-'85115b1a8a2e1bc174075eefacbae6ad9d19af1f'}
11+
# By default, version of src-cli that builds with 1.19.8
12+
VERSION=${1:-'58b3f701691cbdbd10b54161d9bfca88b781480d'}
1313

1414
TEMP=$(mktemp -d -t sgdockerbuild_XXXXXXX)
1515
cleanup() {

dev/sg/checks.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ var checks = map[string]check.CheckFunc{
3333
"caddy-trusted": checkCaddyTrusted,
3434
"asdf": check.CommandOutputContains("asdf", "version"),
3535
"git": check.Combine(check.InPath("git"), checkGitVersion(">= 2.34.1")),
36-
"pnpm": check.Combine(check.InPath("pnpm"), checkPnpmVersion(">= 7.24.2")),
37-
"go": check.Combine(check.InPath("go"), checkGoVersion("~> 1.19.6")),
36+
"pnpm": check.Combine(check.InPath("pnpm"), checkPnpmVersion(">= 7.28.0")),
37+
"go": check.Combine(check.InPath("go"), checkGoVersion("~> 1.19.8")),
3838
"node": check.Combine(check.InPath("node"), check.CommandOutputContains(`node -e "console.log(\"foobar\")"`, "foobar")),
3939
"rust": check.Combine(check.InPath("cargo"), check.CommandOutputContains(`cargo version`, "1.58.0")),
4040
"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'"),

docker-images/opentelemetry-collector/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build custom collector binary
2-
FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS build
2+
FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS build
33

44
ARG OTEL_COLLECTOR_VERSION
55
ENV OTEL_COLLECTOR_VERSION=${OTEL_COLLECTOR_VERSION}

internal/cmd/git-combine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS builder
1+
FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS builder
22

33
WORKDIR /go/src/app
44

internal/cmd/progress-bot/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19.6-alpine@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa AS builder
1+
FROM golang:1.19.8-alpine@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f AS builder
22

33
WORKDIR /go/src/progress-bot
44

0 commit comments

Comments
 (0)