205hlab-mirrors/traefik
2
0
Fork 0
mirror of https://github.com/traefik/traefik.git synced 2026-06-17 19:09:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge v2.11 into v3.6

Browse Source
This commit is contained in:
mmatur
2026-02-23 16:41:44 +01:00
parent 3d8908860f 7c55452b21
commit 13dc9a6892
48 changed files with 526 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yaml
+2 -3
View File
@@ -10,7 +10,6 @@ on:
- 'script/gcg/**'
env:
GO_VERSION: '1.25'
CGO_ENABLED: 0
jobs:
@@ -55,12 +54,12 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
env:
ImageOS: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.goarm }}
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: Artifact webui
.github/workflows/codeql.yml
+2 -1
View File
@@ -34,7 +34,8 @@ jobs:
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
if: ${{ matrix.language == 'go' }}
with:
go-version-file: 'go.mod'
go-version-file: '.go-version'
check-latest: true
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
.github/workflows/experimental.yaml
+2 -3
View File
@@ -7,7 +7,6 @@ on:
- v*
env:
GO_VERSION: '1.25'
CGO_ENABLED: 0
jobs:
@@ -27,12 +26,12 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
env:
ImageOS: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.goarm }}
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: Build
.github/workflows/release.yaml
+2 -4
View File
@@ -6,7 +6,6 @@ on:
- 'v*.*.*'
env:
GO_VERSION: '1.25'
CGO_ENABLED: 0
VERSION: ${{ github.ref_name }}
TRAEFIKER_EMAIL: "traefiker@traefik.io"
@@ -34,13 +33,13 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
env:
# Ensure cache consistency on Linux, see https://github.com/actions/setup-go/pull/383
ImageOS: ${{ matrix.os }}
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: Artifact webui
@@ -133,4 +132,3 @@ jobs:
gh release create ${VERSION} ./dist/**/traefik*.{zip,tar.gz} ./dist/traefik*.{tar.gz,txt} --repo traefik/traefik --title ${VERSION} --notes ${VERSION} --latest=false
./script/deploy.sh
.github/workflows/test-gateway-api-conformance.yaml
+3 -3
View File
@@ -12,7 +12,6 @@ on:
- 'integration/integration_test.go'
env:
GO_VERSION: '1.25'
CGO_ENABLED: 0
jobs:
@@ -26,10 +25,11 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: Avoid generating webui
run: |
.github/workflows/test-integration.yaml
+6 -7
View File
@@ -10,7 +10,6 @@ on:
- 'script/gcg/**'
env:
GO_VERSION: '1.25'
CGO_ENABLED: 0
jobs:
@@ -24,10 +23,10 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: Avoid generating webui
@@ -42,7 +41,7 @@ jobs:
with:
path: |
~/.cache/go-build
key: ${{ runner.os }}-go-build-cache-${{ env.GO_VERSION }}-${{ hashFiles('**/go.sum') }}
key: ${{ runner.os }}-go-build-cache-${{ hashFiles('**/go.mod', '**/go.sum') }}
- name: Artifact traefik binary
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
@@ -67,10 +66,10 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: Download traefik binary
@@ -87,7 +86,7 @@ jobs:
with:
path: |
~/.cache/go-build
key: ${{ runner.os }}-go-build-cache-${{ env.GO_VERSION }}-${{ hashFiles('**/go.sum') }}
key: ${{ runner.os }}-go-build-cache-${{ hashFiles('**/go.mod', '**/go.sum') }}
- name: Generate go test Slice
id: test_split
.github/workflows/test-knative-conformance.yaml
+3 -3
View File
@@ -12,7 +12,6 @@ on:
- 'integration/integration_test.go'
env:
GO_VERSION: '1.25'
CGO_ENABLED: 0
jobs:
@@ -26,10 +25,11 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: Set up KO
uses: ko-build/setup-ko@ace48d793556083a76f1e3e6068850c1f4a369aa # v0.6
.github/workflows/test-unit.yaml
+4 -7
View File
@@ -9,9 +9,6 @@ on:
- '**.md'
- 'script/gcg/**'
env:
GO_VERSION: '1.25'
jobs:
generate-packages:
name: List Go Packages
@@ -24,10 +21,10 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: Generate matrix
@@ -50,10 +47,10 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: Tests
.github/workflows/validate.yaml
+7 -8
View File
@@ -6,8 +6,7 @@ on:
- '*'
env:
GO_VERSION: '1.25'
GOLANGCI_LINT_VERSION: v2.8.0
GOLANGCI_LINT_VERSION: v2.10.1
MISSPELL_VERSION: v0.7.0
jobs:
@@ -21,10 +20,10 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: golangci-lint
@@ -41,10 +40,10 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: Install misspell ${{ env.MISSPELL_VERSION }}
@@ -62,10 +61,10 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go ${{ env.GO_VERSION }}
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: '.go-version'
check-latest: true
- name: go generate