Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 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: ghcr.io/thought-machine/please_alpine:20260318
- image: ghcr.io/thought-machine/please_alpine:20260820
resource_class: large
environment:
PLZ_ARGS: "--profile ci --profile alpine --exclude no-musl"
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
build-linux:
working_directory: ~/please
docker:
- image: ghcr.io/thought-machine/please_ubuntu:20260318
- image: ghcr.io/thought-machine/please_ubuntu:20260820
resource_class: large
environment:
PLZ_ARGS: "--profile ci"
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
build-linux-alt:
working_directory: ~/please
docker:
- image: ghcr.io/thought-machine/please_ubuntu_alt:20260318
- image: ghcr.io/thought-machine/please_ubuntu_alt:20260820
resource_class: large
environment:
PLZ_ARGS: "-c cover --profile ci-alt"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '^1.26'
go-version: '^1.27'
- name: golangci-lint
uses: golangci/golangci-lint-action@v8
with:
version: v2.11
version: v2.13
4 changes: 4 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ linters:
paths:
- test_data
- third_party$
- ^tree$
- ^plz-out$
- builtin$
- examples$
formatters:
Expand All @@ -122,5 +124,7 @@ formatters:
paths:
- test_data
- third_party$
- ^tree$
- ^plz-out$
- builtin$
- examples$
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/thought-machine/please

go 1.26.1
go 1.27.0

ignore plz-out

Expand Down
6 changes: 3 additions & 3 deletions src/remote/action.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func (c *Client) buildCommand(target *core.BuildTarget, inputRoot *pb.Directory,
}
cmd, err := core.ReplaceSequences(state, target, cmd)
return &pb.Command{
Platform: c.targetPlatformProperties(target),
Platform: c.targetPlatformProperties(target), //nolint:staticcheck
Arguments: process.BashCommand(c.shellPath, commandPrefixBuilder.String()+cmd, state.Config.Build.ExitOnError),
EnvironmentVariables: c.buildEnv(target, c.stampedBuildEnvironment(state, target, inputRoot, stamp, isTest || isRun), target.Sandbox),
OutputPaths: outs,
Expand Down Expand Up @@ -161,7 +161,7 @@ func (c *Client) buildTestCommand(state *core.BuildState, target *core.BuildTarg
}
cmd, err := core.TestCommand(state, target)
return &pb.Command{
Platform: &pb.Platform{
Platform: &pb.Platform{ //nolint:staticcheck
Properties: []*pb.Platform_Property{
{
Name: "OSFamily",
Expand All @@ -182,7 +182,7 @@ func (c *Client) buildRunCommand(state *core.BuildState, target *core.BuildTarge
return nil, fmt.Errorf("Target %s has no outputs, it can't be run with `plz run`", target)
}
return &pb.Command{
Platform: c.platform,
Platform: c.platform, //nolint:staticcheck
Arguments: outs,
EnvironmentVariables: c.buildEnv(target, core.GeneralBuildEnvironment(state), false),
}, nil
Expand Down
2 changes: 1 addition & 1 deletion third_party/binary/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GO_CI_LINT_VERSION = "1.61.0"
GO_CI_LINT_VERSION = "2.13.0"

remote_file(
name = "golangci-lint",
Expand Down
12 changes: 6 additions & 6 deletions third_party/go/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ package(default_visibility = ["PUBLIC"])
go_toolchain(
name = "toolchain",
hashes = [
"6231d8d3b8f5552ec6cbf6d685bdd5482e1e703214b120e89b3bf0d7bf1ef725", # go1.26.1.darwin-amd64.tar.gz
"efb87ff28af9a188d0536ef5d42e63dd52ba8263cd7344a993cc48dd11dedb6a", # go1.26.1.darwin-arm64.tar.gz
"0e5ddc51a62018211d461d6bf409939b04eaa4d6dd6d7097910090ef755ed947", # go1.26.1.freebsd-amd64.tar.gz
"5c2c3b16caefa1d968a94c1daca04a7ca301a496d9b086e17ad77bb81393f053", # go1.26.1.linux-amd64.tar.gz
"fe4789e92b1f33358680864bbe8704289e7bb5fc207d80623c308935bd696d49", # go1.26.1.linux-arm64.tar.gz
"d3314e25496e4381d71a5c51d2907e7af655d199f6780b549f015bd85fef4986", # go1.27.0.darwin-amd64.tar.gz
"90493b3bbd5e10f91d12153198bf1994fd756399b4fec93b49b0c6e2acdeeb3e", # go1.27.0.darwin-arm64.tar.gz
"2c24ddcca6dbd5e0be775a48cec4171e9ca616e654b63b02c9cbc515238dae31", # go1.27.0.freebsd-amd64.tar.gz
"675c26c449cbb18fc24b74650de1eabbae6e16f64326fd85a283fb3b58280685", # go1.27.0.linux-amd64.tar.gz
"51798d2c42d0e1c6ed7fd9f48728b4193abac9e8aad6dbac2fe96a81f5909bda", # go1.27.0.linux-arm64.tar.gz
],
install_std = False,
version = "1.26.5",
version = "1.27.0",
)

go_stdlib(
Expand Down
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.26-alpine
FROM golang:1.27-alpine
LABEL org.opencontainers.image.authors="please <at> thoughtmachine <dot> net"
LABEL org.opencontainers.image.source=https://github.com/thought-machine/please

Expand Down
8 changes: 4 additions & 4 deletions tools/images/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM ubuntu:noble
LABEL org.opencontainers.image.authors="please <at> thoughtmachine <dot> net"
LABEL org.opencontainers.image.source=https://github.com/thought-machine/please

ENV DEBIAN_FRONTEND noninteractive
ENV DEBCONF_NONINTERACTIVE_SEEN true
ENV DEBIAN_FRONTEND=noninteractive
ENV DEBCONF_NONINTERACTIVE_SEEN=true

# Python and other dependencies.
RUN truncate -s0 /tmp/preseed.cfg; \
Expand All @@ -20,7 +20,7 @@ RUN printf 'root:0:65536\n' >> /etc/subuid && \
printf 'root:0:65536\n' >> /etc/subgid

# Go - we want a specific package version here.
RUN curl -fsSL https://dl.google.com/go/go1.26.1.linux-amd64.tar.gz | tar -xzC /usr/local
RUN curl -fsSL https://dl.google.com/go/go1.27.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 All @@ -33,7 +33,7 @@ RUN curl https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz > /tm
RUN mkdir -p /usr/local/gcloud \
&& tar -C /usr/local/gcloud -xvf /tmp/google-cloud-sdk.tar.gz \
&& /usr/local/gcloud/google-cloud-sdk/install.sh
ENV PATH /usr/local/gcloud/google-cloud-sdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV PATH=/usr/local/gcloud/google-cloud-sdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

# Welcome message
COPY /motd.txt /etc/motd
Expand Down
4 changes: 2 additions & 2 deletions tools/images/ubuntu_alt/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:jammy
LABEL org.opencontainers.image.authors="please <at> thoughtmachine <dot> net"
LABEL org.opencontainers.image.source=https://github.com/thought-machine/please

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

# Most dependencies; Python, Clang
RUN apt-get update && \
Expand All @@ -15,7 +15,7 @@ RUN printf 'root:0:65536\n' >> /etc/subuid && \
printf 'root:0:65536\n' >> /etc/subgid

# Go
RUN curl -fsSL https://dl.google.com/go/go1.26.1.linux-amd64.tar.gz | tar -xzC /usr/local
RUN curl -fsSL https://dl.google.com/go/go1.27.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/misc/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eu
[ -f "plz-out/please/plz" ] && PLZ="plz-out/please/plz" || PLZ="./pleasew"


$PLZ run //third_party/binary:golangci-lint -p -- run --sort-results src/... tools/...
$PLZ run //third_party/binary:golangci-lint -p -- run src/... tools/...
$PLZ fmt -q || {
echo "BUILD files are not correctly formatted; run plz fmt -w to fix."
exit 1
Expand Down
Loading