From 4e41e2949573d7acbed9d4fa42d53fb6511db388 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 21:02:00 +0000 Subject: [PATCH 1/2] Bump golang from 1.24.6 to 1.25.1 Bumps golang from 1.24.6 to 1.25.1. --- updated-dependencies: - dependency-name: golang dependency-version: 1.25.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ac06a3571..1aed17b97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.6 AS base +FROM golang:1.25.1 AS base ARG VERSION ARG GIT_COMMIT ARG DATE From d7c9a68c6a645d7f5ec63feac5d99afc8384ebf8 Mon Sep 17 00:00:00 2001 From: alxbxbx Date: Mon, 8 Sep 2025 14:41:47 +0200 Subject: [PATCH 2/2] Upgrade go to 1.25.x for github lint --- .github/workflows/build.yaml | 2 +- .github/workflows/golangci-lint.yml | 7 ++++--- .github/workflows/release.yaml | 4 ++-- go.mod | 4 +--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f952b39a4..75499b733 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,7 +33,7 @@ jobs: username: ${{ secrets.QUAY_UBI_READONLY_USERNAME }} password: ${{ secrets.QUAY_UBI_READONLY_PASSWORD }} - name: build - uses: sysdiglabs/exporter-builder@v1.1 + uses: sysdiglabs/exporter-builder@v1.2 with: exporter: postgresql-exporter artifactory_token: ${{ secrets.GAR_DEV_RW_JSON_KEY }} diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 91fd99ba6..3a9f75c12 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -1,5 +1,6 @@ --- # This action is synced from https://github.com/prometheus/prometheus +version: 1 name: golangci-lint on: push: @@ -25,11 +26,11 @@ jobs: - name: install Go uses: actions/setup-go@v5 with: - go-version: 1.23.7 + go-version: 1.25.x - name: Install snmp_exporter/generator dependencies run: sudo apt-get update && sudo apt-get -y install libsnmp-dev if: github.repository == 'prometheus/snmp_exporter' - name: Lint - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@v8 with: - version: v1.64 \ No newline at end of file + version: v2.4.0 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c1bce1288..0fa20f4dd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,7 +20,7 @@ jobs: username: ${{ secrets.QUAY_UBI_READONLY_USERNAME }} password: ${{ secrets.QUAY_UBI_READONLY_PASSWORD }} - name: build - uses: sysdiglabs/exporter-builder@v1.1 + uses: sysdiglabs/exporter-builder@v1.2 with: exporter: postgresql-exporter artifactory_token: ${{ secrets.GAR_DEV_RW_JSON_KEY }} @@ -28,4 +28,4 @@ jobs: sysdig_secure_token: ${{ secrets.SYSDIG_SECURE_TOKEN }} tag_name: ${{ github.event.release.tag_name }} target: ${{ matrix.docker }} - repository: us-docker.pkg.dev \ No newline at end of file + repository: us-docker.pkg.dev diff --git a/go.mod b/go.mod index cb2c2e086..5f47fffe8 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/prometheus-community/postgres_exporter -go 1.23.0 - -toolchain go1.23.7 +go 1.25.0 require ( github.com/DATA-DOG/go-sqlmock v1.5.0