Skip to content

Commit 6abb908

Browse files
committed
chore: upgrade golang to 1.25 and alpine to 3.23
1 parent fd9db18 commit 6abb908

File tree

15 files changed

+27
-30
lines changed

15 files changed

+27
-30
lines changed

.github/workflows/builds.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
matrix:
1313
include:
1414
# check support for oldest supported golang version
15-
- name: go1.23
16-
go-version: "~1.23"
15+
- name: go1.25
16+
go-version: "~1.25"
1717
runs-on: ubuntu-24.04
1818
steps:
1919
- name: Checkout
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v5
2424
with:
25-
go-version: ${{ matrix.go-version || '^1.23' }}
25+
go-version: ${{ matrix.go-version || '^1.25' }}
2626
check-latest: true
2727

2828
- run: |

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
- uses: actions/checkout@v4
2525
- uses: actions/setup-go@v5
2626
with:
27-
go-version: "1.23" # The Go version to download (if necessary) and use.
27+
go-version: "1.25" # The Go version to download (if necessary) and use.
2828
check-latest: false
2929
cache: false
3030

3131
- run: go version
3232
- name: golangci-lint
3333
uses: golangci/golangci-lint-action@v8
3434
with:
35-
version: v2.1.6 # switch to latest if development is unfreezed
35+
version: v2.8.0 # switch to latest if development is unfreezed
3636
args: --timeout=5m

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: "2"
22
run:
3-
go: "1.23"
3+
go: "1.25"
44
# issues:
55
# fix: true
66
linters:

Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ WORKDIR /
88
# apt: ca-certificates git make sudo
99
RUN git clone https://github.com/udhos/update-golang.git \
1010
&& cd update-golang \
11-
&& sudo RELEASE=1.23.9 FORCE_IPV4="-L" ./update-golang.sh \
11+
&& sudo RELEASE=1.25.6 FORCE_IPV4="-L" ./update-golang.sh \
1212
&& ln -s /usr/local/go/bin/go /usr/bin/go
1313
WORKDIR $GOPATH/src/github.com/plgd-dev/hub
1414
COPY go.mod go.sum ./

bundle/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM golang:1.23.9-alpine AS build
2+
FROM golang:1.25.6-alpine AS build
33
RUN apk add --no-cache build-base curl git
44
WORKDIR $GOPATH/src/github.com/plgd-dev/hub
55
COPY go.mod go.sum ./

go.mod

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
module github.com/plgd-dev/hub/v2
22

3-
go 1.23.0
4-
5-
// use export GOTOOLCHAIN=go1.23.0 before calling go mod tidy to avoid tidy adding
6-
// the toolchain directive with your local go version
3+
go 1.25
74

85
require (
96
github.com/favadi/protoc-go-inject-tag v1.4.0
@@ -149,4 +146,4 @@ require (
149146
)
150147

151148
// last versions for Go 1.23
152-
replace github.com/go-json-experiment/json => github.com/go-json-experiment/json v0.0.0-20240815175050-ebd3a8989ca1
149+
//replace github.com/go-json-experiment/json => github.com/go-json-experiment/json v0.0.0-20240815175050-ebd3a8989ca1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj2
6969
github.com/go-acme/lego v2.7.2+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M=
7070
github.com/go-co-op/gocron/v2 v2.16.2 h1:r08P663ikXiulLT9XaabkLypL/W9MoCIbqgQoAutyX4=
7171
github.com/go-co-op/gocron/v2 v2.16.2/go.mod h1:4YTLGCCAH75A5RlQ6q+h+VacO7CgjkgP0EJ+BEOXRSI=
72-
github.com/go-json-experiment/json v0.0.0-20240815175050-ebd3a8989ca1 h1:xcuWappghOVI8iNWoF2OKahVejd1LSVi/v4JED44Amo=
73-
github.com/go-json-experiment/json v0.0.0-20240815175050-ebd3a8989ca1/go.mod h1:BWmvoE1Xia34f3l/ibJweyhrT+aROb/FQ6d+37F0e2s=
72+
github.com/go-json-experiment/json v0.0.0-20240815174924-0599f16bf0e2 h1:T01ryfhob+ta3ADOh2B2FLA1cFLVOaQJH/iwh22rIFM=
73+
github.com/go-json-experiment/json v0.0.0-20240815174924-0599f16bf0e2/go.mod h1:uDEMZSTQMj7V6Lxdrx4ZwchmHEGdICbjuY+GQd7j9LM=
7474
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
7575
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
7676
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=

http-gateway/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM golang:1.23.9-alpine AS build
2+
FROM golang:1.25.6-alpine AS build
33
ARG VERSION
44
ARG COMMIT_DATE
55
ARG SHORT_COMMIT
@@ -27,7 +27,7 @@ RUN go build \
2727
-o /go/bin/http-gateway \
2828
./cmd/service
2929

30-
FROM alpine:3.22 AS security-provider
30+
FROM alpine:3.23 AS security-provider
3131
RUN apk add -U --no-cache ca-certificates \
3232
&& addgroup -S nonroot \
3333
&& adduser -S nonroot -G nonroot

test/cloud-server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM golang:1.23.9-alpine AS build
2+
FROM golang:1.25.6-alpine AS build
33
ARG VERSION
44
ARG COMMIT_DATE
55
ARG SHORT_COMMIT

test/device-provisioning-service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23.9-alpine AS build
1+
FROM golang:1.25.6-alpine AS build
22
RUN apk add --no-cache build-base curl git
33
WORKDIR $GOPATH/src/github.com/plgd-dev/hub
44
COPY go.mod go.sum ./

0 commit comments

Comments
 (0)