diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 7f9e6b5ca..6d1393825 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -39,12 +39,12 @@ jobs: shell: sh - name: golangci-lint - uses: golangci/golangci-lint-action@v4 + uses: golangci/golangci-lint-action@v9 with: # Require: The version of golangci-lint to use. # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version. # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit. - version: v1.64.5 + version: v2.12.2 args: --timeout=10m # Optional: working directory, useful for monorepos diff --git a/Makefile b/Makefile index ec7c12cfb..ecf44e3b1 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ GOPATH=$(shell go env GOPATH) VERSION=$(shell make -s version) PYTHON?=python3 BINPATH?=$(GOPATH)/bin -GOLANGCI_LINT_VERSION=v2.0.2 # version supporting go 1.24 +GOLANGCI_LINT_VERSION=v2.12.2 # version supporting go 1.25 COVERAGE_DIR?=$(shell mktemp -d) GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) diff --git a/go.mod b/go.mod index 825d4dd97..a0a4f84d2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aptly-dev/aptly -go 1.24.6 +go 1.25.0 require ( github.com/AlekSi/pointer v1.1.0 diff --git a/system/Dockerfile b/system/Dockerfile index 59c86a520..d3bb8d900 100644 --- a/system/Dockerfile +++ b/system/Dockerfile @@ -1,14 +1,17 @@ FROM debian:trixie-slim -RUN apt-get update -y && apt-get install -y --no-install-recommends curl gnupg bzip2 xz-utils ca-certificates vim procps \ - golang golang-go golang-doc golang-src \ +RUN echo 'deb http://deb.debian.org/debian trixie-backports main' > /etc/apt/sources.list.d/backports.list && \ + apt-get update -y && apt-get install -y --no-install-recommends curl gnupg bzip2 xz-utils ca-certificates vim procps \ + golang-1.25 golang-1.25-go golang-1.25-src \ make git python3 python3-requests-unixsocket python3-termcolor python3-swiftclient python3-boto3 python3-azure-storage \ g++ python3-etcd3 python3-plyvel graphviz devscripts sudo dh-golang binutils-i686-linux-gnu binutils-aarch64-linux-gnu \ binutils-arm-linux-gnueabihf bash-completion zip ruby-dev lintian npm \ libc6-dev-i386-cross libc6-dev-armhf-cross libc6-dev-arm64-cross \ gcc-i686-linux-gnu gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu \ faketime dput-ng && \ - apt-get clean && rm -rf /var/lib/apt/lists/* + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + ln -sf /usr/lib/go-1.25/bin/go /usr/local/bin/go && \ + ln -sf /usr/lib/go-1.25/bin/gofmt /usr/local/bin/gofmt RUN useradd -m --shell /bin/bash --home-dir /var/lib/aptly aptly RUN sed -i 's/#force_color_prompt=yes/force_color_prompt=yes/' /var/lib/aptly/.bashrc