From 20ec4b5d073aacfa147468bfe8b29a81bca41148 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Dec 2025 18:30:29 +0000 Subject: [PATCH 01/11] chore(deps): update rust crate axum to v0.8.8 --- Cargo.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5a37197..350ac51 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,9 +62,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "axum" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" +checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8" dependencies = [ "axum-core", "bytes", @@ -294,7 +294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -1300,7 +1300,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -1572,7 +1572,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] From 0d0a974139f01cce6046d47a62a1485a23be69fc Mon Sep 17 00:00:00 2001 From: Wisaroot Lertthaweedech Date: Mon, 22 Dec 2025 17:12:14 +0700 Subject: [PATCH 02/11] feat: update check-pre-release --- .github/docs/assets/TODO | 1 + .github/workflows/ci.yml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .github/docs/assets/TODO diff --git a/.github/docs/assets/TODO b/.github/docs/assets/TODO new file mode 100644 index 0000000..b6c4eda --- /dev/null +++ b/.github/docs/assets/TODO @@ -0,0 +1 @@ +move this out of .github diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8618444..2c3cae1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,10 +18,10 @@ jobs: # ==================================================== check-pre-release: name: check-pre-release - uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@v0 + uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@develop/update-gh-workflow with: target_label: "pre-release" - branch_prefix: "release/" + branch_prefixes: '["release/"]' zerv-versioning: name: zerv-versioning @@ -79,6 +79,8 @@ jobs: uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@v0 with: target_label: "deploy" + branch_prefixes: "[]" + branch_names: "[]" deploy-no-env: needs: [zerv-versioning, check-deploy-no-env-label] From 5e459cb1e105d75efe426ed6136fe134317279e6 Mon Sep 17 00:00:00 2001 From: Wisaroot Lertthaweedech Date: Mon, 22 Dec 2025 17:16:50 +0700 Subject: [PATCH 03/11] feat: update check-pre-release --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c3cae1..f3f9175 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: # ==================================================== check-pre-release: name: check-pre-release - uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@develop/update-gh-workflow + uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@d618649915daec135e5a461f89acd8447a13a927 with: target_label: "pre-release" branch_prefixes: '["release/"]' From 5bdc154f31a47ae950e5057e0a1029d8de3fb380 Mon Sep 17 00:00:00 2001 From: Wisaroot Lertthaweedech Date: Mon, 22 Dec 2025 17:19:28 +0700 Subject: [PATCH 04/11] feat: dev --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3f9175..5a00c38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: # ==================================================== check-pre-release: name: check-pre-release - uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@d618649915daec135e5a461f89acd8447a13a927 + uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@v0 with: target_label: "pre-release" branch_prefixes: '["release/"]' From a215048a0543e886537da40d9f2fc4ae2327fd1c Mon Sep 17 00:00:00 2001 From: Wisaroot Lertthaweedech Date: Mon, 22 Dec 2025 17:21:11 +0700 Subject: [PATCH 05/11] feat: dev --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a00c38..41549e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,8 @@ jobs: uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@v0 with: target_label: "pre-release" - branch_prefixes: '["release/"]' + branch_prefix: "release/" + # branch_prefixes: '["release/"]' zerv-versioning: name: zerv-versioning From 1e6a2da6ae4f1c78042cec392b5b20ea4438f575 Mon Sep 17 00:00:00 2001 From: Wisaroot Lertthaweedech Date: Mon, 22 Dec 2025 17:22:26 +0700 Subject: [PATCH 06/11] feat: dev --- README.md | 6 +++--- {.github/docs => docs}/assets/TODO | 0 .../docs => docs}/assets/deployment-flow-1.excalidraw.svg | 0 .../docs => docs}/assets/deployment-flow-2.excalidraw.svg | 0 .../docs => docs}/assets/deployment-flow-3.excalidraw.svg | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename {.github/docs => docs}/assets/TODO (100%) rename {.github/docs => docs}/assets/deployment-flow-1.excalidraw.svg (100%) rename {.github/docs => docs}/assets/deployment-flow-2.excalidraw.svg (100%) rename {.github/docs => docs}/assets/deployment-flow-3.excalidraw.svg (100%) diff --git a/README.md b/README.md index 9a4adff..049a2e2 100644 --- a/README.md +++ b/README.md @@ -86,13 +86,13 @@ A demonstration of [**zerv**](https://github.com/wislertt/zerv) in action. Shows The following scenarios demonstrate how the deployment flow works in practice: - **Initial State**: Only the main branch exists. All environments (development, nonproduction, production) and environment-less deployments reference version `v1.1.2` from the main branch. - ![Initial Deployment State](https://raw.githubusercontent.com/wislertt/zerv-flow/main/.github/docs/assets/deployment-flow-1.excalidraw.svg) + ![Initial Deployment State](https://raw.githubusercontent.com/wislertt/zerv-flow/main/docs/assets/deployment-flow-1.excalidraw.svg) - **Feature Branch Deployment**: A `feature/1` branch is created with PR labels `deploy-n` and `deploy`. The nonproduction environment deploys version `v1.1.3-alpha.1.post.2` from the feature branch and becomes locked to it. Development and production remain on main branch `v1.1.2`. The environment-less deployment creates a new version `v1.1.3-alpha.1.post.2` without overriding previous versions. - ![Feature Branch Deployment](https://raw.githubusercontent.com/wislertt/zerv-flow/main/.github/docs/assets/deployment-flow-2.excalidraw.svg) + ![Feature Branch Deployment](https://raw.githubusercontent.com/wislertt/zerv-flow/main/docs/assets/deployment-flow-2.excalidraw.svg) - **Concurrent Feature Deployment**: While `feature/1` PR is active, a `feature/2` branch is created with PR labels `deploy-d`, `deploy-n`, and `deploy`. Nonproduction deployment fails due to being locked by `feature/1`. Development deploys successfully with version `v1.1.3-alpha.2.post3` from `feature/2`. Environment-less deployment creates another new version `v1.1.3-alpha.2.post.3` alongside the existing version. - ![Concurrent Feature Deployment](https://raw.githubusercontent.com/wislertt/zerv-flow/main/.github/docs/assets/deployment-flow-3.excalidraw.svg) + ![Concurrent Feature Deployment](https://raw.githubusercontent.com/wislertt/zerv-flow/main/docs/assets/deployment-flow-3.excalidraw.svg) ## Branch Rules and Version Generation (Configurable) diff --git a/.github/docs/assets/TODO b/docs/assets/TODO similarity index 100% rename from .github/docs/assets/TODO rename to docs/assets/TODO diff --git a/.github/docs/assets/deployment-flow-1.excalidraw.svg b/docs/assets/deployment-flow-1.excalidraw.svg similarity index 100% rename from .github/docs/assets/deployment-flow-1.excalidraw.svg rename to docs/assets/deployment-flow-1.excalidraw.svg diff --git a/.github/docs/assets/deployment-flow-2.excalidraw.svg b/docs/assets/deployment-flow-2.excalidraw.svg similarity index 100% rename from .github/docs/assets/deployment-flow-2.excalidraw.svg rename to docs/assets/deployment-flow-2.excalidraw.svg diff --git a/.github/docs/assets/deployment-flow-3.excalidraw.svg b/docs/assets/deployment-flow-3.excalidraw.svg similarity index 100% rename from .github/docs/assets/deployment-flow-3.excalidraw.svg rename to docs/assets/deployment-flow-3.excalidraw.svg From 89eebb7c98a998a5dd57605336f75a0dd1695383 Mon Sep 17 00:00:00 2001 From: Wisaroot Lertthaweedech Date: Mon, 22 Dec 2025 17:24:20 +0700 Subject: [PATCH 07/11] feat: dev --- .github/workflows/ci.yml | 2 -- docs/assets/TODO | 1 - 2 files changed, 3 deletions(-) delete mode 100644 docs/assets/TODO diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41549e2..cd6a20c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,8 +80,6 @@ jobs: uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@v0 with: target_label: "deploy" - branch_prefixes: "[]" - branch_names: "[]" deploy-no-env: needs: [zerv-versioning, check-deploy-no-env-label] diff --git a/docs/assets/TODO b/docs/assets/TODO deleted file mode 100644 index b6c4eda..0000000 --- a/docs/assets/TODO +++ /dev/null @@ -1 +0,0 @@ -move this out of .github From 4c30f7b199da1e746e5a32194b081762d0b05f75 Mon Sep 17 00:00:00 2001 From: Wisaroot Lertthaweedech Date: Mon, 22 Dec 2025 17:25:48 +0700 Subject: [PATCH 08/11] feat: dev --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd6a20c..5727c61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,11 +18,11 @@ jobs: # ==================================================== check-pre-release: name: check-pre-release - uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@v0 + uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@develop/update-gh-workflow with: target_label: "pre-release" - branch_prefix: "release/" - # branch_prefixes: '["release/"]' + # branch_prefix: "release/" + branch_prefixes: '["release/"]' zerv-versioning: name: zerv-versioning From 9b3e88a71eb4c8c6eac914cded47eb7552a85489 Mon Sep 17 00:00:00 2001 From: Wisaroot Lertthaweedech Date: Mon, 22 Dec 2025 17:36:24 +0700 Subject: [PATCH 09/11] feat: dev --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5727c61..5bb2550 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,8 @@ jobs: uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@develop/update-gh-workflow with: target_label: "pre-release" - # branch_prefix: "release/" - branch_prefixes: '["release/"]' + # branch_prefixes: '["release/"]' + branch_prefixes: '["renovate/"]' zerv-versioning: name: zerv-versioning From b020123b439451fb4e7c98f4fe19174d568581a3 Mon Sep 17 00:00:00 2001 From: Wisaroot Lertthaweedech Date: Mon, 22 Dec 2025 17:38:04 +0700 Subject: [PATCH 10/11] feat: dev --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5bb2550..66941bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,8 @@ jobs: uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@develop/update-gh-workflow with: target_label: "pre-release" - # branch_prefixes: '["release/"]' - branch_prefixes: '["renovate/"]' + # branch_prefixes: '["renovate/"]' + branch_names: '["renovate/axum-monorepo"]' zerv-versioning: name: zerv-versioning From 2a8525fa1a373d6885962a94c293aaee428f9457 Mon Sep 17 00:00:00 2001 From: Wisaroot Lertthaweedech Date: Mon, 22 Dec 2025 17:48:57 +0700 Subject: [PATCH 11/11] feat: dev --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66941bb..d9743d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,11 +18,10 @@ jobs: # ==================================================== check-pre-release: name: check-pre-release - uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@develop/update-gh-workflow + uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@v0 with: target_label: "pre-release" - # branch_prefixes: '["renovate/"]' - branch_names: '["renovate/axum-monorepo"]' + branch_prefixes: '["release/"]' zerv-versioning: name: zerv-versioning