Skip to content

Commit

Permalink
Have khan-dotfiles install go 1.21 now. (#90)
Browse files Browse the repository at this point in the history
## Summary:
This is step 2(d)(i) from
https://khanacademy.atlassian.net/wiki/spaces/ENG/pages/949387416/Go+version+upgrades

I updated the kabuild Dockerfile too, even though it's not used
anymore.  We should just delete the entire containers/ directory.

Issue: https://khanacademy.atlassian.net/browse/INFRA-9497

## Test plan:
None

Author: csilvers

Reviewers: dbraley, MiguelCastillo, nathanjd

Required Reviewers:

Approved By: dbraley, MiguelCastillo

Checks:

Pull Request URL: #90
  • Loading branch information
csilvers authored Oct 5, 2023
1 parent 9661bb7 commit 122a924
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion containers/kabuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ RUN apt-get install -y \

# TODO: Get version from common location
# WARNING: We REALLY WANT to avoid requring make and/or break standalone skaffold.
ENV DESIRED_GO_VERSION=1.16
ENV DESIRED_GO_VERSION=1.21
RUN apt-get install -y golang-${DESIRED_GO_VERSION}
RUN cp -sf /usr/lib/go-${DESIRED_GO_VERSION}/bin/* /usr/local/bin/

Expand Down
2 changes: 1 addition & 1 deletion shared-functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ install_protoc_common() {
}

DESIRED_GO_MAJOR_VERISON=1
DESIRED_GO_MINOR_VERISON=19
DESIRED_GO_MINOR_VERISON=21
DESIRED_GO_VERSION="$DESIRED_GO_MAJOR_VERISON.$DESIRED_GO_MINOR_VERISON"

# Evaluates to truthy if go is installed and
Expand Down

0 comments on commit 122a924

Please sign in to comment.