Skip to content

Commit

Permalink
Update images to use Go 1.21 (#2900)
Browse files Browse the repository at this point in the history
* Update images to Go 1.21

* Version

* update with #2895
  • Loading branch information
peterebden authored Sep 3, 2023
1 parent dc37391 commit 66f7751
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 11 deletions.
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
build-alpine:
working_directory: ~/please
docker:
- image: thoughtmachine/please_alpine:20230709
- image: thoughtmachine/please_alpine:20230903
resource_class: large
environment:
PLZ_ARGS: "-p --profile ci --profile alpine --exclude no-musl"
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
build-linux:
working_directory: ~/please
docker:
- image: thoughtmachine/please_ubuntu:20230709
- image: thoughtmachine/please_ubuntu:20230903
resource_class: large
environment:
PLZ_ARGS: "-p --profile ci"
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
build-linux-alt:
working_directory: ~/please
docker:
- image: thoughtmachine/please_ubuntu_alt:20230709
- image: thoughtmachine/please_ubuntu_alt:20230903
resource_class: large
environment:
PLZ_ARGS: "-p -c cover --profile ci-alt"
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
build-linux-arm64:
working_directory: ~/please
docker:
- image: thoughtmachine/please_ubuntu:20230709
- image: thoughtmachine/please_ubuntu:20230903
resource_class: large
steps:
- checkout
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
test-rex:
working_directory: ~/please
docker:
- image: thoughtmachine/please_ubuntu:20230709
- image: thoughtmachine/please_ubuntu:20230903
resource_class: xlarge
steps:
- checkout
Expand All @@ -262,7 +262,7 @@ jobs:
test-http-cache:
working_directory: ~/please
docker:
- image: thoughtmachine/please_ubuntu:20230709
- image: thoughtmachine/please_ubuntu:20230903
resource_class: large
steps:
- checkout
Expand Down Expand Up @@ -305,7 +305,7 @@ jobs:
# Runs a benchmarking test and records some performance results.
perf-test:
docker:
- image: thoughtmachine/please_ubuntu:20230709
- image: thoughtmachine/please_ubuntu:20230903
resource_class: xlarge # Want to run these tests with a significant amount of parallelism
steps:
- checkout
Expand Down
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 17.3.1
--------------
* Fixed `plz query somepath` to not hang in the face of a graph cycle (#2893)
* Fix stripping in text_file (#2895)

Version 17.3.0
--------------
* REX: fix issue with downloading the outputs of filegroups with remote execution (#2885)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.3.0
17.3.1
2 changes: 1 addition & 1 deletion tools/images/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine
FROM golang:1.21-alpine
MAINTAINER [email protected]

RUN apk update && apk add --no-cache git patch gcc g++ libc-dev bash libgcc xz protoc protobuf-dev perl-utils
Expand Down
2 changes: 1 addition & 1 deletion tools/images/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN truncate -s0 /tmp/preseed.cfg; \
apt-get clean

# Go - we want a specific package version here.
RUN curl -fsSL https://dl.google.com/go/go1.20.4.linux-amd64.tar.gz | tar -xzC /usr/local
RUN curl -fsSL https://dl.google.com/go/go1.21.0.linux-amd64.tar.gz | tar -xzC /usr/local
RUN ln -s /usr/local/go/bin/go /usr/local/bin/go && ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt

# Locale
Expand Down
2 changes: 1 addition & 1 deletion tools/images/ubuntu_alt/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apt-get update && \
apt-get clean

# Go
RUN curl -fsSL https://dl.google.com/go/go1.21rc2.linux-amd64.tar.gz | tar -xzC /usr/local
RUN curl -fsSL https://dl.google.com/go/go1.20.7.linux-amd64.tar.gz | tar -xzC /usr/local
RUN ln -s /usr/local/go/bin/go /usr/local/bin/go && ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt

# Locale
Expand Down

0 comments on commit 66f7751

Please sign in to comment.