Skip to content

Commit eea072b

Browse files
committed
Merge remote-tracking branch 'upstream/main' into dependabot/moby-go-archive-temp
* upstream/main: chore(deps): bump actions/checkout from 6.0.1 to 6.0.2 (#3560) chore(deps): bump go.opentelemetry.io/otel/sdk to v1.41.0 (#3589) feat: add TiDB module (#3575) feat: add Forgejo module (#3556) feat: improve container conflict detection (#3574) chore(deps): bump go to 1.25 everywhere (#3572) chore(pulsar): bump base image to 4.x, replacing the wait for log strategy with wait for listening port (deterministic) (#3573) chore(deps): bump github.com/sigstore/sigstore in /modules/compose (#3571) chore(compose): update to compose-v5 (#3568) chore(deps): bump github.com/modelcontextprotocol/go-sdk (#3557) chore(deps): bump mkdocs-codeinclude-plugin from 0.2.1 to 0.3.1 (#3561) chore: update usage metrics (2026-03-02) (#3565) chore(deps): bump mkdocs-include-markdown-plugin from 7.2.0 to 7.2.1 (#3562) chore(deps): bump go.opentelemetry.io/otel/sdk in /modules/grafana-lgtm (#3563) chore(deps): bump go.opentelemetry.io/otel/sdk in /modules/toxiproxy (#3564)
2 parents 7734e95 + bad114f commit eea072b

249 files changed

Lines changed: 4779 additions & 3213 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// README at: https://github.com/devcontainers/templates/tree/main/src/go
33
{
44
"name": "Go",
5-
"image": "mcr.microsoft.com/devcontainers/go:1.24-trixie",
5+
"image": "mcr.microsoft.com/devcontainers/go:1.25-trixie",
66

77
// Features to add to the dev container. More info: https://containers.dev/features.
88
// "features": {},

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ updates:
3535
- /modules/dynamodb
3636
- /modules/elasticsearch
3737
- /modules/etcd
38+
- /modules/forgejo
3839
- /modules/gcloud
3940
- /modules/grafana-lgtm
4041
- /modules/inbucket
@@ -71,6 +72,7 @@ updates:
7172
- /modules/socat
7273
- /modules/solace
7374
- /modules/surrealdb
75+
- /modules/tidb
7476
- /modules/toxiproxy
7577
- /modules/valkey
7678
- /modules/vault

.github/workflows/ci-lint-go.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: 'ubuntu-latest'
2222
steps:
2323
- name: Check out code into the Go module directory
24-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
24+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2525

2626
- name: Set up Go
2727
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
@@ -33,8 +33,7 @@ jobs:
3333
- name: golangci-lint
3434
uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
3535
with:
36-
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
37-
version: v2.0.2
36+
version: v2.9.0
3837
# Optional: working directory, useful for monorepos
3938
working-directory: ${{ inputs.project-directory }}
4039

.github/workflows/ci-test-go.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
rootless: true
6161

6262
- name: Check out code into the Go module directory
63-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
63+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6464
with:
6565
# Disabling shallow clone is recommended for improving relevancy of reporting
6666
fetch-depth: 0
@@ -118,7 +118,7 @@ jobs:
118118
- name: Decide if Sonar must be run
119119
if: ${{ matrix.platform == 'ubuntu-latest' }}
120120
run: |
121-
if [[ "1.24.x" == "${{ inputs.go-version }}" ]] && \
121+
if [[ "1.25.x" == "${{ inputs.go-version }}" ]] && \
122122
[[ "true" != "${{ inputs.rootless-docker }}" ]] && \
123123
[[ "true" != "${{ inputs.testcontainers-cloud }}" ]] && \
124124
[[ "true" != "${{ inputs.ryuk-disabled }}" ]] && \

.github/workflows/ci-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
})
2525
2626
- name: Checkout
27-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
27+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2828
with:
2929
token: ${{ secrets.GITHUB_TOKEN }}
3030
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
modules_count: ${{ steps.set-modified-modules-count.outputs.modules_count }}
1919
steps:
2020
- name: Check out code into the Go module directory
21-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
21+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2222

2323
- id: changed-files
2424
name: Get changed files
@@ -61,7 +61,7 @@ jobs:
6161
# We don't want to fail the build the soonest but identify which modules passed and failed.
6262
fail-fast: false
6363
matrix:
64-
go-version: [1.24.x, 1.25.x]
64+
go-version: [1.25.x, 1.26.x]
6565
module: ${{ fromJSON(needs.detect-modules.outputs.modules) }}
6666
permissions:
6767
contents: read # for actions/checkout to fetch code
@@ -88,7 +88,7 @@ jobs:
8888
# We don't want to fail the build the soonest but identify which modules passed and failed.
8989
fail-fast: false
9090
matrix:
91-
go-version: [1.24.x, 1.25.x]
91+
go-version: [1.25.x, 1.26.x]
9292
uses: ./.github/workflows/ci-test-go.yml
9393
with:
9494
go-version: ${{ matrix.go-version }}
@@ -109,7 +109,7 @@ jobs:
109109
name: "Test with reaper off"
110110
strategy:
111111
matrix:
112-
go-version: [1.24.x, 1.25.x]
112+
go-version: [1.25.x, 1.26.x]
113113
uses: ./.github/workflows/ci-test-go.yml
114114
with:
115115
go-version: ${{ matrix.go-version }}
@@ -130,7 +130,7 @@ jobs:
130130
name: "Test with Rootless Docker"
131131
strategy:
132132
matrix:
133-
go-version: [1.24.x, 1.25.x]
133+
go-version: [1.25.x, 1.26.x]
134134
uses: ./.github/workflows/ci-test-go.yml
135135
with:
136136
go-version: ${{ matrix.go-version }}

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949

5050
steps:
5151
- name: Checkout repository
52-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
52+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5353

5454
# Initializes the CodeQL tools for scanning.
5555
- name: Initialize CodeQL

.github/workflows/docker-projects-latest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
echo "containerd_integration=${{ matrix.containerd-integration == true && 'containerd' || '' }}" >> "$GITHUB_ENV"
2323
2424
- name: Check out code into the Go module directory
25-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626

2727
- name: Set up Go
2828
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
@@ -88,7 +88,7 @@ jobs:
8888
continue-on-error: true
8989
steps:
9090
- name: Check out code into the Go module directory
91-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
91+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9292

9393
- name: Set up Go
9494
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: "Checkout code"
23-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
23+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2424
with:
2525
persist-credentials: false
2626

.github/workflows/sonar-bulk-operations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
bulk-operation:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
18+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1919

2020
- name: Execute Bulk Operation
2121
env:

0 commit comments

Comments
 (0)