From a59bcb29b55c2229f5376bd65fb827168e024301 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 23 Jul 2025 09:56:04 +0200 Subject: [PATCH 1/2] Improve integration tests --- .github/workflows/test-integration.yaml | 33 ++++++++++++++++++++++--- Makefile | 2 +- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-integration.yaml b/.github/workflows/test-integration.yaml index 806148268..9eaa2880a 100644 --- a/.github/workflows/test-integration.yaml +++ b/.github/workflows/test-integration.yaml @@ -34,7 +34,21 @@ jobs: run: touch webui/static/index.html - name: Build binary - run: make binary + run: make binary-linux-amd64 + + - name: Save go cache build + uses: actions/cache/save@v4 + with: + path: | + ~/.cache/go-build + key: ${{ runner.os }}-go-build-cache-${{ env.GO_VERSION }}-${{ hashFiles('**/go.sum') }} + + - name: Artifact traefik binary + uses: actions/upload-artifact@v4 + with: + name: traefik + path: ./dist/linux/amd64/traefik + retention-days: 1 test-integration: runs-on: ubuntu-latest @@ -61,8 +75,21 @@ jobs: - name: Avoid generating webui run: touch webui/static/index.html - - name: Build binary - run: make binary + - name: Download traefik binary + uses: actions/download-artifact@v4 + with: + name: traefik + path: ./dist/linux/amd64/ + + - name: Make binary executable + run: chmod +x ./dist/linux/amd64/traefik + + - name: Restore go cache build + uses: actions/cache/restore@v4 + with: + path: | + ~/.cache/go-build + key: ${{ runner.os }}-go-build-cache-${{ env.GO_VERSION }}-${{ hashFiles('**/go.sum') }} - name: Generate go test Slice id: test_split diff --git a/Makefile b/Makefile index f435fdc2d..b3a7f58b5 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ test-unit: .PHONY: test-integration #? test-integration: Run the integration tests -test-integration: binary +test-integration: GOOS=$(GOOS) GOARCH=$(GOARCH) go test ./integration -test.timeout=20m -failfast -v $(TESTFLAGS) .PHONY: test-ui-unit From c6daab54e33033e34c1d5c6fe236e2fb7939fc46 Mon Sep 17 00:00:00 2001 From: Romain Date: Wed, 23 Jul 2025 10:34:04 +0200 Subject: [PATCH 2/2] Prepare release v2.11.28 --- CHANGELOG.md | 11 +++++++++++ script/gcg/traefik-bugfix.toml | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d46ff3bd..c9731bc52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [v2.11.28](https://github.com/traefik/traefik/tree/v2.11.28) (2025-07-23) +[All Commits](https://github.com/traefik/traefik/compare/v2.11.27...v2.11.28) + +**Bug fixes:** +- **[logs]** Redact logged install configuration ([#11907](https://github.com/traefik/traefik/pull/11907) by [jspdown](https://github.com/jspdown)) +- **[plugins]** Fix client arbitrary file access during archive extraction zipslip ([#11911](https://github.com/traefik/traefik/pull/11911) by [odaysec](https://github.com/odaysec)) +- **[server]** Disable MPTCP by default ([#11918](https://github.com/traefik/traefik/pull/11918) by [rtribotte](https://github.com/rtribotte)) + +**Documentation:** +- **[k8s/crd,k8s]** Remove all mentions of ordering for TLSOption CurvePreferences field ([#11924](https://github.com/traefik/traefik/pull/11924) by [jnoordsij](https://github.com/jnoordsij)) + ## [v2.11.27](https://github.com/traefik/traefik/tree/v2.11.27) (2025-07-11) [All Commits](https://github.com/traefik/traefik/compare/v2.11.26...v2.11.27) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index 6cb9289b0..6bc515de5 100644 --- a/script/gcg/traefik-bugfix.toml +++ b/script/gcg/traefik-bugfix.toml @@ -4,11 +4,11 @@ RepositoryName = "traefik" OutputType = "file" FileName = "traefik_changelog.md" -# example new bugfix v2.11.27 +# example new bugfix v2.11.28 CurrentRef = "v2.11" -PreviousRef = "v2.11.26" +PreviousRef = "v2.11.27" BaseBranch = "v2.11" -FutureCurrentRefName = "v2.11.27" +FutureCurrentRefName = "v2.11.28" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10