From cccf77d38cf2342bc4201516bce2d96821864a5d Mon Sep 17 00:00:00 2001 From: support Date: Sun, 1 Nov 2026 08:05:17 +0100 Subject: [PATCH 1/2] Run CI on release branches The build, test and Docker workflows listened only to develop and main, so nothing merged to 2.4.x was built or tested by CI. The pattern covers later release branches too. --- .github/workflows/aspnetcore.yml | 4 ++-- .github/workflows/docker-image-pr.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/aspnetcore.yml b/.github/workflows/aspnetcore.yml index 2fbcc22ae8..fe6c92762e 100644 --- a/.github/workflows/aspnetcore.yml +++ b/.github/workflows/aspnetcore.yml @@ -2,9 +2,9 @@ name: ASP.NET Core CI on: push: - branches: [ develop, main ] + branches: [ develop, main, '[0-9]+.[0-9]+.x' ] pull_request: - branches: [ develop, main ] + branches: [ develop, main, '[0-9]+.[0-9]+.x' ] jobs: build: diff --git a/.github/workflows/docker-image-pr.yml b/.github/workflows/docker-image-pr.yml index 4556fe1605..15a47588b0 100644 --- a/.github/workflows/docker-image-pr.yml +++ b/.github/workflows/docker-image-pr.yml @@ -2,9 +2,9 @@ name: Docker Image CI on: push: - branches: [ "develop" ] + branches: [ "develop", "[0-9]+.[0-9]+.x" ] pull_request: - branches: [ "develop" ] + branches: [ "develop", "[0-9]+.[0-9]+.x" ] jobs: build: From 9b1dbcf9753a6f38525db598a422c6455c41073a Mon Sep 17 00:00:00 2001 From: support Date: Sun, 1 Nov 2026 08:05:17 +0100 Subject: [PATCH 2/2] Set version 2.4.1 --- .ai/standards/dependencies.md | 2 +- src/Build/Grand.Common.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ai/standards/dependencies.md b/.ai/standards/dependencies.md index 7c3425610c..6722ff0f98 100644 --- a/.ai/standards/dependencies.md +++ b/.ai/standards/dependencies.md @@ -44,7 +44,7 @@ Every project imports `..\..\Build\Grand.Common.props`, which sets: - `ImplicitUsings` = `true` - global using of `System.Text` - release build with no debug symbols -- product version, currently `2.4.0`, set in the `SetVersion` target +- product version, currently `2.4.1`, set in the `SetVersion` target Do not override `TargetFramework` or `LangVersion` in an individual project. diff --git a/src/Build/Grand.Common.props b/src/Build/Grand.Common.props index a6f74ff1fa..5b3909fa5a 100644 --- a/src/Build/Grand.Common.props +++ b/src/Build/Grand.Common.props @@ -42,7 +42,7 @@ - 2.4.0 + 2.4.1 \ No newline at end of file