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
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: "1.26.2"
go-version: "1.26.3"

- name: Run go test for coverage
run: go test -vet=off ./... -race -coverprofile=coverage.out -covermode=atomic
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cross-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: "1.26.2"
go-version: "1.26.3"

- name: Run unit tests
run: go test -mod=vendor ./pkg/... ./cmd/...
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: "1.26.2"
go-version: "1.26.3"

- name: Run E2E Tests
run: go test -v -tags=e2e -timeout 15m ./test/e2e/...
8 changes: 4 additions & 4 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: "1.26.2"
go-version: "1.26.3"

- name: Build and Install
run: |
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: "1.26.2"
go-version: "1.26.3"

- name: Build and Install
run: |
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: "1.26.2"
go-version: "1.26.3"

- name: Build and Install
run: |
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: "1.26.2"
go-version: "1.26.3"

- name: Build and Install
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v6
with:
go-version: '1.26.2'
go-version: '1.26.3'

- name: Set up QEMU
uses: docker/setup-qemu-action@v4
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
golang 1.26.2
golang 1.26.3
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* chore(deps): bump github.com/aws/aws-sdk-go-v2/service/dynamodb from 1.55.0 to 1.57.3 (#596)
* chore(deps): bump github.com/aws/aws-sdk-go-v2/service/acm from 1.38.1 to 1.38.3 (#597)
* chore: bump Go from 1.25 to 1.26 in build infra (Dockerfile, workflows)
* chore: bump Go toolchain to 1.26.3 to patch stdlib CVEs (CVE-2026-33811, CVE-2026-33814, CVE-2026-39820, CVE-2026-39836, CVE-2026-42499)

### v0.41.1 (2026-04-22)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ See [Docker documentation](docs/docker.md) for complete usage including Docker C

### Building from Source

Go 1.26.2 is required to build confd. The module uses `go 1.26` for language compatibility and `toolchain go1.26.2` to pin the expected patch-level toolchain.
Go 1.26.3 is required to build confd. The module uses `go 1.26` for language compatibility and `toolchain go1.26.3` to pin the expected patch-level toolchain.

```bash
git clone https://github.com/abtreece/confd.git
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Multi-stage build Dockerfile for CI testing
# Builds confd from source and produces a minimal runtime image

FROM golang:1.26.2-alpine AS builder
FROM golang:1.26.3-alpine AS builder

# Install build dependencies
RUN apk add --no-cache git make
Expand Down
12 changes: 6 additions & 6 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ This guide covers setting up a development environment, building, testing, and d

| Tool | Version | Purpose |
|------|---------|---------|
| Go | 1.26.2 | Build and test |
| Go | 1.26.3 | Build and test |
| golangci-lint | latest | Linting |
| make | any | Build automation |

The `go.mod` file keeps the language version at `go 1.26` and pins the expected patch-level compiler with `toolchain go1.26.2`. Keep `.tool-versions`, CI `setup-go` entries, Docker build images, and documentation aligned with that toolchain version.
The `go.mod` file keeps the language version at `go 1.26` and pins the expected patch-level compiler with `toolchain go1.26.3`. Keep `.tool-versions`, CI `setup-go` entries, Docker build images, and documentation aligned with that toolchain version.

### Optional Tools

Expand All @@ -43,9 +43,9 @@ brew install go golangci-lint goreleaser

**Linux:**
```bash
# Go 1.26.2
wget https://go.dev/dl/go1.26.2.linux-amd64.tar.gz
sudo tar -C /usr/local -xzf go1.26.2.linux-amd64.tar.gz
# Go 1.26.3
wget https://go.dev/dl/go1.26.3.linux-amd64.tar.gz
sudo tar -C /usr/local -xzf go1.26.3.linux-amd64.tar.gz
export PATH=$PATH:/usr/local/go/bin

# golangci-lint
Expand All @@ -71,7 +71,7 @@ This creates `bin/confd` with the Git SHA embedded via ldflags.

```bash
./bin/confd --version
# Output: confd 0.40.0-rc.1 (Git SHA: abc1234, Go Version: go1.26.2)
# Output: confd 0.40.0-rc.1 (Git SHA: abc1234, Go Version: go1.26.3)
```

### Project Structure
Expand Down
2 changes: 1 addition & 1 deletion docs/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ CMD ["consul", "--node", "http://consul:8500", "--watch"]
### Multi-stage Build from Source

```dockerfile
FROM golang:1.26.2-alpine AS builder
FROM golang:1.26.3-alpine AS builder

RUN apk add --no-cache git make
WORKDIR /src
Expand Down
4 changes: 2 additions & 2 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ RUN CONFD_ARCH=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \

#### Building from Source

Building from source requires the Go 1.26.2 toolchain. The module declares `go 1.26` for language compatibility and `toolchain go1.26.2` for the expected compiler patch version.
Building from source requires the Go 1.26.3 toolchain. The module declares `go 1.26` for language compatibility and `toolchain go1.26.3` for the expected compiler patch version.

```bash
make build
Expand All @@ -167,7 +167,7 @@ docker build -t confd:local -f docker/Dockerfile.build .
Include confd in your own Docker image using a multi-stage build:

```dockerfile
FROM golang:1.26.2-alpine AS confd-builder
FROM golang:1.26.3-alpine AS confd-builder

RUN apk add --no-cache git
WORKDIR /src
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/abtreece/confd

go 1.26

toolchain go1.26.2
toolchain go1.26.3

require (
github.com/BurntSushi/toml v1.6.0
Expand Down
Loading