diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8618444..d9743d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: uses: wislertt/zerv/.github/workflows/shared-check-pr-label-and-branch.yml@v0 with: target_label: "pre-release" - branch_prefix: "release/" + branch_prefixes: '["release/"]' zerv-versioning: name: zerv-versioning 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]] 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/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