Skip to content

Commit c2a645e

Browse files
committed
go: use version 1.25.0
1 parent d9bedfa commit c2a645e

4 files changed

Lines changed: 10 additions & 7 deletions

File tree

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ jobs:
3939
shell: sh
4040

4141
- name: golangci-lint
42-
uses: golangci/golangci-lint-action@v4
42+
uses: golangci/golangci-lint-action@v9
4343
with:
4444
# Require: The version of golangci-lint to use.
4545
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
4646
# When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
47-
version: v1.64.5
47+
version: v2.12.2
4848
args: --timeout=10m
4949

5050
# Optional: working directory, useful for monorepos

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ GOPATH=$(shell go env GOPATH)
22
VERSION=$(shell make -s version)
33
PYTHON?=python3
44
BINPATH?=$(GOPATH)/bin
5-
GOLANGCI_LINT_VERSION=v2.0.2 # version supporting go 1.24
5+
GOLANGCI_LINT_VERSION=v2.12.2 # version supporting go 1.25
66
COVERAGE_DIR?=$(shell mktemp -d)
77
GOOS=$(shell go env GOHOSTOS)
88
GOARCH=$(shell go env GOHOSTARCH)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/aptly-dev/aptly
22

3-
go 1.24.6
3+
go 1.25.0
44

55
require (
66
github.com/AlekSi/pointer v1.1.0

system/Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
FROM debian:trixie-slim
22

3-
RUN apt-get update -y && apt-get install -y --no-install-recommends curl gnupg bzip2 xz-utils ca-certificates vim procps \
4-
golang golang-go golang-doc golang-src \
3+
RUN echo 'deb http://deb.debian.org/debian trixie-backports main' > /etc/apt/sources.list.d/backports.list && \
4+
apt-get update -y && apt-get install -y --no-install-recommends curl gnupg bzip2 xz-utils ca-certificates vim procps \
5+
golang-1.25 golang-1.25-go golang-1.25-src \
56
make git python3 python3-requests-unixsocket python3-termcolor python3-swiftclient python3-boto3 python3-azure-storage \
67
g++ python3-etcd3 python3-plyvel graphviz devscripts sudo dh-golang binutils-i686-linux-gnu binutils-aarch64-linux-gnu \
78
binutils-arm-linux-gnueabihf bash-completion zip ruby-dev lintian npm \
89
libc6-dev-i386-cross libc6-dev-armhf-cross libc6-dev-arm64-cross \
910
gcc-i686-linux-gnu gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu \
1011
faketime dput-ng && \
11-
apt-get clean && rm -rf /var/lib/apt/lists/*
12+
apt-get clean && rm -rf /var/lib/apt/lists/* && \
13+
ln -sf /usr/lib/go-1.25/bin/go /usr/local/bin/go && \
14+
ln -sf /usr/lib/go-1.25/bin/gofmt /usr/local/bin/gofmt
1215

1316
RUN useradd -m --shell /bin/bash --home-dir /var/lib/aptly aptly
1417
RUN sed -i 's/#force_color_prompt=yes/force_color_prompt=yes/' /var/lib/aptly/.bashrc

0 commit comments

Comments
 (0)