chore: fix dependabot alerts (#3595)

* chore: fix dependabot alerts

Signed-off-by: Ramkumar Chinchani <rchincha.dev@gmail.com>

* ci: bump up golang to 1.25.x

Signed-off-by: Ramkumar Chinchani <rchincha.dev@gmail.com>

* fix: linter errors

Signed-off-by: Ramkumar Chinchani <rchincha.dev@gmail.com>

* fix: stacker and docker build files to use golang 1.25

Signed-off-by: Ramkumar Chinchani <rchincha.dev@gmail.com>

---------

Signed-off-by: Ramkumar Chinchani <rchincha.dev@gmail.com>
This commit is contained in:
Ramkumar Chinchani
2025-11-26 01:21:36 -08:00
committed by GitHub
parent 09de471774
commit 6452bec403
37 changed files with 186 additions and 189 deletions
+2 -2
View File
@@ -14,11 +14,11 @@ jobs:
name: Performance regression check
runs-on: oracle-vm-8cpu-32gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
# Run benchmark with `go test -bench` and stores the output to a file
- name: Run benchmark
run: make BENCH_OUTPUT=ci-cd run-bench
+2 -2
View File
@@ -14,11 +14,11 @@ jobs:
runs-on: ubuntu-latest
name: coverage
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
+2 -2
View File
@@ -25,12 +25,12 @@ jobs:
arch: [amd64, arm64]
steps:
- name: Check out source code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Install go
uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Cache go dependencies
id: cache-go-dependencies
uses: actions/cache@v4
+2 -2
View File
@@ -21,9 +21,9 @@ jobs:
uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Check out source code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
+4 -4
View File
@@ -16,11 +16,11 @@ jobs:
name: Stateless zot with minio and boltdb
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
@@ -271,11 +271,11 @@ jobs:
name: Stateless zot with minio and redis
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
+5 -5
View File
@@ -43,17 +43,17 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Install go
uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v4.31.3
uses: github/codeql-action/init@v4.31.5
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,7 +64,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v4.31.3
uses: github/codeql-action/autobuild@v4.31.5
# ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
@@ -77,4 +77,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v4.31.3
uses: github/codeql-action/analyze@v4.31.5
+1 -1
View File
@@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Check Commit Type
uses: gsactions/commit-message-checker@v2
with:
+2 -2
View File
@@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-latest
name: compare-with-main
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Checkout zot (main branch)
run: |
mkdir -p $GITHUB_WORKSPACE/zot_main
+1 -1
View File
@@ -10,7 +10,7 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up Python 3.x
uses: actions/setup-python@v6
with:
+2 -2
View File
@@ -16,11 +16,11 @@ jobs:
name: Check client tools
runs-on: oracle-vm-16cpu-64gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
+8 -8
View File
@@ -16,11 +16,11 @@ jobs:
name: GC(with referrers) on filesystem with short interval
runs-on: oracle-vm-8cpu-32gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Run zb
id: bench
@@ -55,11 +55,11 @@ jobs:
name: GC(without referrers) on filesystem with short interval
runs-on: oracle-vm-8cpu-32gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Run zb
id: bench
@@ -94,11 +94,11 @@ jobs:
name: GC(with referrers) on S3(minio) with short interval
runs-on: oracle-vm-8cpu-32gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- uses: ./.github/actions/setup-localstack
- name: Setup minio service
run: |
@@ -178,11 +178,11 @@ jobs:
name: GC(without referrers) on S3(minio) with short interval
runs-on: oracle-vm-8cpu-32gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- uses: ./.github/actions/setup-localstack
- name: Setup minio service
run: |
+2 -2
View File
@@ -18,8 +18,8 @@ jobs:
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
- uses: actions/checkout@v4
go-version: 1.25.x
- uses: actions/checkout@v6
- name: Run linter with GH action
uses: golangci/golangci-lint-action@v9
with:
+3 -3
View File
@@ -21,11 +21,11 @@ jobs:
name: Check GQL generation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
@@ -40,7 +40,7 @@ jobs:
name: Check GQL schema follows best practices
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
+2 -2
View File
@@ -18,11 +18,11 @@ jobs:
runs-on: ubuntu-latest
name: License Check
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Install go-licenses
run: go install github.com/google/go-licenses@latest
- name: Check for forbidden licenses
+16 -16
View File
@@ -18,10 +18,10 @@ jobs:
name: Dedupe/restore blobs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
go-version: 1.24.x
go-version: 1.25.x
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
@@ -69,10 +69,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out source code
uses: actions/checkout@v4
uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
go-version: 1.24.x
go-version: 1.25.x
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
@@ -86,11 +86,11 @@ jobs:
name: GC(with referrers) on S3(localstack) with short interval
runs-on: oracle-vm-16cpu-64gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- uses: ./.github/actions/setup-localstack
- name: Run zb
@@ -123,11 +123,11 @@ jobs:
name: GC(without referrers) on S3(localstack) with short interval
runs-on: oracle-vm-16cpu-64gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- uses: ./.github/actions/setup-localstack
- name: Run zb
@@ -160,9 +160,9 @@ jobs:
name: Build docker image (for users still using Docker environments)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Check out source code
uses: actions/checkout@v4
uses: actions/checkout@v6
- uses: ./.github/actions/clean-runner
- name: Build image
run: |
@@ -172,10 +172,10 @@ jobs:
name: Prometheus setup
runs-on: oracle-vm-8cpu-32gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
go-version: 1.24.x
go-version: 1.25.x
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
@@ -203,11 +203,11 @@ jobs:
name: s3+dynamodb scale-out
runs-on: oracle-vm-16cpu-64gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
@@ -289,11 +289,11 @@ jobs:
name: s3+redis scale-out
runs-on: oracle-vm-16cpu-64gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
@@ -24,9 +24,9 @@ jobs:
uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Checkout this PR
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Start zot server
run: |
cd $GITHUB_WORKSPACE
@@ -34,7 +34,7 @@ jobs:
RUNNER_TRACKING_ID="" && ./bin/zot-linux-amd64 serve examples/config-conformance.json &
IP=`hostname -I | awk '{print $1}'`
echo "SERVER_URL=http://${IP}:8080" >> $GITHUB_ENV
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
repository: opencontainers/distribution-spec
ref: main
+6 -6
View File
@@ -27,7 +27,7 @@ jobs:
echo "BASE_IMAGE=gcr.io/distroless/base-debian12:latest-${ARCH}" >> "$GITHUB_ENV"
fi
- name: Check out the repo
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Log in to GitHub Docker Registry
uses: docker/login-action@v3
with:
@@ -112,7 +112,7 @@ jobs:
image: [zot, zot-minimal, zxp, zb]
steps:
- name: Check out the repo
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Log in to GitHub Docker Registry
uses: docker/login-action@v3
with:
@@ -253,7 +253,7 @@ jobs:
TRIVY_USERNAME: ${{ github.actor }}
TRIVY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v4.31.3
uses: github/codeql-action/upload-sarif@v4.31.5
with:
sarif_file: 'trivy-results.sarif'
@@ -290,7 +290,7 @@ jobs:
TRIVY_USERNAME: ${{ github.actor }}
TRIVY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v4.31.3
uses: github/codeql-action/upload-sarif@v4.31.5
with:
sarif_file: 'trivy-results.sarif'
@@ -303,13 +303,13 @@ jobs:
packages: write
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: main
fetch-depth: '0'
- name: Checkout project-zot/helm-charts
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: project-zot/helm-charts
ref: main
+2 -2
View File
@@ -25,7 +25,7 @@ jobs:
steps:
- name: "Checkout code"
uses: actions/checkout@v4 # v3.0.0
uses: actions/checkout@v6 # v3.0.0
with:
persist-credentials: false
@@ -57,6 +57,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@v4.31.3
uses: github/codeql-action/upload-sarif@v4.31.5
with:
sarif_file: results.sarif
+1 -1
View File
@@ -40,7 +40,7 @@ jobs:
packages: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
sparse-checkout: |
Makefile
+8 -8
View File
@@ -16,12 +16,12 @@ jobs:
name: Running zot without extensions tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Install go
uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Cache go dependencies
id: cache-go-dependencies
uses: actions/cache@v4
@@ -56,11 +56,11 @@ jobs:
name: Run zot with extensions tests
runs-on: oracle-vm-16cpu-64gb-x86-64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Cache go dependencies
id: cache-go-dependencies
uses: actions/cache@v4
@@ -95,11 +95,11 @@ jobs:
name: Running privileged tests on Linux
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Cache go dependencies
id: cache-go-dependencies
uses: actions/cache@v4
@@ -129,11 +129,11 @@ jobs:
if: always()
needs: [test-run-minimal,test-run-extensions,test-run-devmode]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: download all workflow coverage files
uses: actions/download-artifact@v6
- name: merge code coverage
+2 -2
View File
@@ -22,11 +22,11 @@ jobs:
godebug: "fips140=only"
name: TLS check (${{ matrix.mode }})
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Install dependencies
run: |
cd $GITHUB_WORKSPACE
+2 -2
View File
@@ -19,12 +19,12 @@ jobs:
name: Verify Config Files
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Install go
uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Cache go dependencies
id: cache-go-dependencies
uses: actions/cache@v4
+2 -2
View File
@@ -25,9 +25,9 @@ jobs:
uses: actions/setup-go@v6
with:
cache: false
go-version: 1.24.x
go-version: 1.25.x
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Build zot
run: |
echo "Building $FLAVOR"