@@ -11,9 +11,9 @@ This skill automates the release preparation workflow for the [Azure App Configu
1111
1212Use this skill when you need to:
1313- Bump the package version for a new stable or preview release
14- - Create merge PRs to sync branches (test- main → test- preview, test- main → test- release/stable, test- preview → test- release)
14+ - Create merge PRs to sync branches (main → preview, main → release/stable, preview → release)
1515- Prepare all the PRs needed before publishing a new release
16- - Resolve merge conflicts between test- main and test- preview branches
16+ - Resolve merge conflicts between main and preview branches
1717
1818## Background
1919
@@ -22,10 +22,10 @@ Use this skill when you need to:
2222- ** Package Name** : ` @azure/app-configuration-provider `
2323
2424### Branch Structure
25- - ` test- main` – primary development branch for stable releases
26- - ` test- preview` – development branch for preview releases
27- - ` test- release/stable/v{major}` – release branch for stable versions (e.g., ` test- release/stable/v2` )
28- - ` test- release/v{major}` – release branch for preview versions (e.g., ` test- release/v2` )
25+ - ` main ` – primary development branch for stable releases
26+ - ` preview ` – development branch for preview releases
27+ - ` release/stable/v{major} ` – release branch for stable versions (e.g., ` release/stable/v2 ` )
28+ - ` release/v{major} ` – release branch for preview versions (e.g., ` release/v2 ` )
2929
3030### Version Files
3131The version must be updated in ** all four locations** simultaneously:
@@ -48,7 +48,7 @@ Ask the user whether this is a **stable** or **preview** release, and what the *
4848
4949#### Step 1: Version Bump PR
5050
51- Create a version bump PR targeting ` test- main` by running the version bump script:
51+ Create a version bump PR targeting ` main ` by running the version bump script:
5252
5353``` bash
5454./scripts/version-bump.sh < new_version>
@@ -58,15 +58,15 @@ For example: `./scripts/version-bump.sh 2.5.0`
5858
5959The script will automatically:
60601 . Read the current version from ` src/version.ts ` .
61- 2 . Create a new branch from ` test- main` named ` <username>/version-<new_version> ` (e.g., ` linglingye/version-2.5.0 ` ).
61+ 2 . Create a new branch from ` main ` named ` <username>/version-<new_version> ` (e.g., ` linglingye/version-2.5.0 ` ).
62623 . Update the version in all four files (` src/version.ts ` , ` package.json ` , ` package-lock.json ` lines 3 and 9).
63- 4 . Commit, push, and create a PR to ` test- main` with title: ` Version bump <new_version> ` .
63+ 4 . Commit, push, and create a PR to ` main ` with title: ` Version bump <new_version> ` .
6464
6565When the script prompts ` Proceed? [y/N] ` , confirm by entering ` y ` .
6666
6767#### Step 2: Merge Main to Release Branch
6868
69- After the version bump PR is merged, create a PR to merge ` test- main` into the stable release branch by running:
69+ After the version bump PR is merged, create a PR to merge ` main ` into the stable release branch by running:
7070
7171``` bash
7272./scripts/merge-to-release.sh < new_version>
@@ -84,20 +84,20 @@ When the script prompts `Proceed? [y/N]`, confirm by entering `y`.
8484
8585#### Step 1: Merge Main to Preview (Conflict Resolution)
8686
87- Create a PR to merge ` test- main` into ` test- preview` . This will likely have conflicts.
87+ Create a PR to merge ` main ` into ` preview ` . This will likely have conflicts.
8888
89- 1 . Fetch the latest ` test- main` and ` test- preview` branches.
90- 2 . Create a new branch from ` test- preview` named ` <username>/resolve-conflict ` (or similar).
91- 3 . Merge ` test- main` into this branch. If there are conflicts, inform the user and let them resolve manually.
92- 4 . Push the branch and create a PR targeting ` test- preview` with title: ` Merge test- main to test- preview ` .
89+ 1 . Fetch the latest ` main ` and ` preview ` branches.
90+ 2 . Create a new branch from ` preview ` named ` <username>/resolve-conflict ` (or similar).
91+ 3 . Merge ` main ` into this branch. If there are conflicts, inform the user and let them resolve manually.
92+ 4 . Push the branch and create a PR targeting ` preview ` with title: ` Merge main to preview ` .
9393
9494> ** Important** : Use "Merge commit" (not squash) when merging this PR.
9595
9696** Sample PR** : https://github.com/Azure/AppConfiguration-JavaScriptProvider/pull/272
9797
9898#### Step 2: Version Bump PR
9999
100- After the merge-to-preview PR is merged, create a version bump PR targeting ` test- preview` by running the version bump script with the ` --preview ` flag:
100+ After the merge-to-preview PR is merged, create a version bump PR targeting ` preview ` by running the version bump script with the ` --preview ` flag:
101101
102102``` bash
103103./scripts/version-bump.sh < new_version> --preview
@@ -109,7 +109,7 @@ When the script prompts `Proceed? [y/N]`, confirm by entering `y`.
109109
110110#### Step 3: Merge Preview to Release Branch
111111
112- After the version bump PR is merged, create a PR to merge ` test- preview` into the preview release branch by running:
112+ After the version bump PR is merged, create a PR to merge ` preview ` into the preview release branch by running:
113113
114114``` bash
115115./scripts/merge-to-release.sh < new_version> --preview
0 commit comments