Skip to content

Commit 596644b

Browse files
make server branch build more specific to server-v4 (#184)
1 parent 88cc986 commit 596644b

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ jobs:
6464
steps:
6565
- checkout
6666
- run:
67-
name: Fetch branches matching server-*
67+
name: Fetch branches matching server-4*
6868
command: |
69-
for branch in $(git ls-remote --heads origin | awk '{print $2}' | grep 'refs/heads/server-' | sed 's|refs/heads/||'); do
69+
for branch in $(git ls-remote --heads origin | awk '{print $2}' | grep 'refs/heads/server-4' | sed 's|refs/heads/||'); do
7070
echo "[INFO] Fetching branch: $branch"
7171
git checkout "$branch"
7272
git pull origin "$branch"

DEVELOPMENT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ The site will be available at `http://localhost:3000` by default.
8484
npm run build:docs
8585
```
8686

87-
- **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:
87+
- **Fetch server branches** (for server admin docs). You will need to have local copies of all server-4* branches to be able to build the full docs site locally:
8888
```bash
8989
npm run fetch-server-branches
9090
```
9191

92-
- **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:
92+
- **Force fetch server branches** if you want to force all your server-4* 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-4* branch:
9393

9494
```bash
9595
npm run fetch-server-branches --force
@@ -257,7 +257,7 @@ When changes are made to the main branch to the build processes, the UI, or all
257257
3. Run `git rebase main`
258258
4. Push those changes with `git push --force-with-lease origin server-4.1` - remember to use the correct server branch number.
259259

260-
This should be done for every server-* branch.
260+
This should be done for every server-4* branch.
261261

262262
### Creating a New Component
263263

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ This technical documentation consists of several specialized files:
4141
cd circleci-docs-static
4242
npm ci
4343
```
44-
2. **Make sure you've cloned server-* branches (Server Administration Docs)**
44+
2. **Make sure you've cloned server-4* branches (Server Administration Docs)**
4545

4646
```bash
4747
npm run fetch-server-branches

antora-playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ content:
1616
start_path: docs/orbs
1717
- url: .
1818
start_path: docs/server-admin
19-
branches: [server-*]
19+
branches: [server-4*]
2020
- url: .
2121
start_path: docs/contributors
2222
ui:

scripts/fetch-server-branches.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44
# Parse command line arguments
55
FORCE_UPDATE=false
66
if [[ "$1" == "--force" || "$1" == "-f" ]]; then
7-
echo "[WARNING] Force update will discard any local changes on server-* branches!"
8-
echo "[WARNING] This will reset all server-* branches to exactly match origin."
7+
echo "[WARNING] Force update will discard any local changes on server-4* branches!"
8+
echo "[WARNING] This will reset all server-4* branches to exactly match origin."
99
read -p "Are you sure you want to continue? (y/N): " -n 1 -r
1010
echo
1111
if [[ $REPLY =~ ^[Yy]$ ]]; then
@@ -25,8 +25,8 @@ echo "[INFO] Current branch: $current_branch"
2525
echo "[INFO] Fetching remote branches..."
2626
git fetch origin
2727

28-
# Process all server-* branches
29-
for branch in $(git ls-remote --heads origin | awk '{print $2}' | grep 'refs/heads/server-' | sed 's|refs/heads/||'); do
28+
# Process all server-4* branches
29+
for branch in $(git ls-remote --heads origin | awk '{print $2}' | grep 'refs/heads/server-4' | sed 's|refs/heads/||'); do
3030
echo "[INFO] Updating branch: $branch"
3131
git checkout "$branch" 2>/dev/null || {
3232
echo "[INFO] Branch $branch doesn't exist locally, creating it..."
@@ -48,8 +48,8 @@ echo "[INFO] Returning to original branch: $current_branch"
4848
git checkout "$current_branch"
4949

5050
if [[ "$FORCE_UPDATE" == true ]]; then
51-
echo "[INFO] All server-* branches have been force-updated to match origin"
51+
echo "[INFO] All server-4* branches have been force-updated to match origin"
5252
else
53-
echo "[INFO] All server-* branches have been updated"
53+
echo "[INFO] All server-4* branches have been updated"
5454
echo "[INFO] Use --force or -f flag to force-update branches and avoid conflicts"
5555
fi

0 commit comments

Comments
 (0)