change all references to server branches to lose the v (#170)

Author: rosieyohannan

.circleci/config.yml

@@ -63,9 +63,9 @@ jobs:
     steps:
       - checkout
       - run:
-          name: Fetch branches matching server-v*
+          name: Fetch branches matching server-*
           command: |
-            for branch in $(git ls-remote --heads origin | awk '{print $2}' | grep 'refs/heads/server-v' | sed 's|refs/heads/||'); do
+            for branch in $(git ls-remote --heads origin | awk '{print $2}' | grep 'refs/heads/server-' | sed 's|refs/heads/||'); do
               echo "[INFO] Fetching branch: $branch"
               git checkout "$branch"
               git pull origin "$branch"

DEVELOPMENT.md

@@ -84,12 +84,12 @@ The site will be available at `http://localhost:3000` by default.
   npm run build:docs
   ```
 
-- **Fetch server branches** (for server admin docs). You will need to have local copies of all server-v* branches to be able to build the full docs site locally:
+- **Fetch server branches** (for server admin docs). You will need to have local copies of all server-* branches to be able to build the full docs site locally:
   ```bash
   npm run fetch-server-branches
   ```
 
-- **Force fetch server branches** if you want to force all your server-v* branches to the state of the upstream "current" versions, use the --force flag. This is recommended if you have no local changes on any server-v* branch:
+- **Force fetch server branches** if you want to force all your server-* branches to the state of the upstream "current" versions, use the --force flag. This is recommended if you have no local changes on any server-* branch:
 
   ```bash
   npm run fetch-server-branches --force
@@ -100,7 +100,7 @@ The site will be available at `http://localhost:3000` by default.
 
 - `main` - Production-ready code
 - Feature branches - Named according to the feature being developed
-- Version branches - For version-specific documentation (e.g., `server-v4.1`)
+- Version branches - For version-specific documentation (e.g., `server-4.1`)
 
 ## Content Authoring
 
@@ -255,9 +255,9 @@ When changes are made to the main branch to the build processes, the UI, or all
 1. Update local main branch
 2. Checkout a server branch
 3. Run `git rebase main`
-4. Push those changes with `git push --force-with-lease origin server-v4.1` - remember to use the correct server branch number.
+4. Push those changes with `git push --force-with-lease origin server-4.1` - remember to use the correct server branch number.
 
-This should be done for every server-v* branch.
+This should be done for every server-* branch.
 
 ### Creating a New Component
 

README.md

@@ -40,7 +40,7 @@ This technical documentation consists of several specialized files:
    cd circleci-docs-static
    npm ci
    ```
-2. **Make sure you've cloned server-v branches (Server Administration Docs)**
+2. **Make sure you've cloned server-* branches (Server Administration Docs)**
 
 ```bash
    npm run fetch-server-branches

antora-playbook.yml

@@ -16,7 +16,7 @@ content:
     start_path: docs/orbs
   - url: .
     start_path: docs/server-admin
-    branches: [server-v*]
+    branches: [server-*]
   - url: .
     start_path: docs/contributors
 ui:

extensions/export-content-extension.js

@@ -39,13 +39,13 @@ function collectPages(contentCatalog, siteUrl) {
 
   // Define which server-admin versions to exclude from indexing
   const excludedServerAdminVersions = [
-    'server-v4.1',
-    'server-v4.2',
-    'server-v4.3',
-    'server-v4.4',
-    'server-v4.5',
-    'server-v4.6',
-    'server-v4.7'
+    'server-4.1',
+    'server-4.2',
+    'server-4.3',
+    'server-4.4',
+    'server-4.5',
+    'server-4.6',
+    'server-4.7'
   ];
 
   contentCatalog.getComponents().forEach(({ name: comp, versions }) => {

scripts/fetch-server-branches.sh

@@ -4,8 +4,8 @@ set -e
 # Parse command line arguments
 FORCE_UPDATE=false
 if [[ "$1" == "--force" || "$1" == "-f" ]]; then
-    echo "[WARNING] Force update will discard any local changes on server-v* branches!"
-    echo "[WARNING] This will reset all server-v* branches to exactly match origin."
+    echo "[WARNING] Force update will discard any local changes on server-* branches!"
+    echo "[WARNING] This will reset all server-* branches to exactly match origin."
     read -p "Are you sure you want to continue? (y/N): " -n 1 -r
     echo
     if [[ $REPLY =~ ^[Yy]$ ]]; then
@@ -25,8 +25,8 @@ echo "[INFO] Current branch: $current_branch"
 echo "[INFO] Fetching remote branches..."
 git fetch origin
 
-# Process all server-v* branches
-for branch in $(git ls-remote --heads origin | awk '{print $2}' | grep 'refs/heads/server-v' | sed 's|refs/heads/||'); do
+# Process all server-* branches
+for branch in $(git ls-remote --heads origin | awk '{print $2}' | grep 'refs/heads/server-' | sed 's|refs/heads/||'); do
   echo "[INFO] Updating branch: $branch"
   git checkout "$branch" 2>/dev/null || {
     echo "[INFO] Branch $branch doesn't exist locally, creating it..."
@@ -48,8 +48,8 @@ echo "[INFO] Returning to original branch: $current_branch"
 git checkout "$current_branch"
 
 if [[ "$FORCE_UPDATE" == true ]]; then
-    echo "[INFO] All server-v* branches have been force-updated to match origin"
+    echo "[INFO] All server-* branches have been force-updated to match origin"
 else
-    echo "[INFO] All server-v* branches have been updated"
+    echo "[INFO] All server-* branches have been updated"
     echo "[INFO] Use --force or -f flag to force-update branches and avoid conflicts"
 fi