mirror of https://github.com/garrytan/gstack.git
Merge 6d643c534b into a3259400a3
This commit is contained in:
commit
b9e2715078
|
|
@ -1218,7 +1218,7 @@ BASE_VERSION=$(git show origin/$BASE_BRANCH:VERSION 2>/dev/null | tr -d '\r\n[:s
|
||||||
# We don't need the exact original level — we just need "a level" that passes to the util.
|
# We don't need the exact original level — we just need "a level" that passes to the util.
|
||||||
# If the minor digit advanced, call it minor; patch digit, patch; etc. If base > branch, skip (not ours to land).
|
# If the minor digit advanced, call it minor; patch digit, patch; etc. If base > branch, skip (not ours to land).
|
||||||
# For simplicity: use "patch" as a conservative default; util handles collision-past regardless of input level.
|
# For simplicity: use "patch" as a conservative default; util handles collision-past regardless of input level.
|
||||||
QUEUE_JSON=$(bun run bin/gstack-next-version \
|
QUEUE_JSON=$(bun run ~/.claude/skills/gstack/bin/gstack-next-version \
|
||||||
--base "$BASE_BRANCH" \
|
--base "$BASE_BRANCH" \
|
||||||
--bump patch \
|
--bump patch \
|
||||||
--current-version "$BASE_VERSION" 2>/dev/null || echo '{"offline":true}')
|
--current-version "$BASE_VERSION" 2>/dev/null || echo '{"offline":true}')
|
||||||
|
|
|
||||||
|
|
@ -341,7 +341,7 @@ BASE_VERSION=$(git show origin/$BASE_BRANCH:VERSION 2>/dev/null | tr -d '\r\n[:s
|
||||||
# We don't need the exact original level — we just need "a level" that passes to the util.
|
# We don't need the exact original level — we just need "a level" that passes to the util.
|
||||||
# If the minor digit advanced, call it minor; patch digit, patch; etc. If base > branch, skip (not ours to land).
|
# If the minor digit advanced, call it minor; patch digit, patch; etc. If base > branch, skip (not ours to land).
|
||||||
# For simplicity: use "patch" as a conservative default; util handles collision-past regardless of input level.
|
# For simplicity: use "patch" as a conservative default; util handles collision-past regardless of input level.
|
||||||
QUEUE_JSON=$(bun run bin/gstack-next-version \
|
QUEUE_JSON=$(bun run ~/.claude/skills/gstack/bin/gstack-next-version \
|
||||||
--base "$BASE_BRANCH" \
|
--base "$BASE_BRANCH" \
|
||||||
--bump patch \
|
--bump patch \
|
||||||
--current-version "$BASE_VERSION" 2>/dev/null || echo '{"offline":true}')
|
--current-version "$BASE_VERSION" 2>/dev/null || echo '{"offline":true}')
|
||||||
|
|
|
||||||
|
|
@ -840,7 +840,7 @@ they'd claim for micro/patch/minor/major. Cheap (same gh call cached by bun).
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
for LEVEL in micro patch minor major; do
|
for LEVEL in micro patch minor major; do
|
||||||
bun run bin/gstack-next-version \
|
bun run ~/.claude/skills/gstack/bin/gstack-next-version \
|
||||||
--base "$BASE_BRANCH" \
|
--base "$BASE_BRANCH" \
|
||||||
--bump "$LEVEL" \
|
--bump "$LEVEL" \
|
||||||
--current-version "$BASE_VERSION" \
|
--current-version "$BASE_VERSION" \
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ they'd claim for micro/patch/minor/major. Cheap (same gh call cached by bun).
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
for LEVEL in micro patch minor major; do
|
for LEVEL in micro patch minor major; do
|
||||||
bun run bin/gstack-next-version \
|
bun run ~/.claude/skills/gstack/bin/gstack-next-version \
|
||||||
--base "$BASE_BRANCH" \
|
--base "$BASE_BRANCH" \
|
||||||
--bump "$LEVEL" \
|
--bump "$LEVEL" \
|
||||||
--current-version "$BASE_VERSION" \
|
--current-version "$BASE_VERSION" \
|
||||||
|
|
|
||||||
|
|
@ -1133,7 +1133,7 @@ Check whether this PR's claimed VERSION still points at a free slot in the queue
|
||||||
BRANCH_VERSION=$(git show HEAD:VERSION 2>/dev/null | tr -d '\r\n[:space:]' || echo "")
|
BRANCH_VERSION=$(git show HEAD:VERSION 2>/dev/null | tr -d '\r\n[:space:]' || echo "")
|
||||||
BASE_BRANCH=$(gh pr view --json baseRefName -q .baseRefName 2>/dev/null || echo main)
|
BASE_BRANCH=$(gh pr view --json baseRefName -q .baseRefName 2>/dev/null || echo main)
|
||||||
BASE_VERSION=$(git show origin/$BASE_BRANCH:VERSION 2>/dev/null | tr -d '\r\n[:space:]' || echo "")
|
BASE_VERSION=$(git show origin/$BASE_BRANCH:VERSION 2>/dev/null | tr -d '\r\n[:space:]' || echo "")
|
||||||
QUEUE_JSON=$(bun run bin/gstack-next-version \
|
QUEUE_JSON=$(bun run ~/.claude/skills/gstack/bin/gstack-next-version \
|
||||||
--base "$BASE_BRANCH" \
|
--base "$BASE_BRANCH" \
|
||||||
--bump patch \
|
--bump patch \
|
||||||
--current-version "$BASE_VERSION" 2>/dev/null || echo '{"offline":true}')
|
--current-version "$BASE_VERSION" 2>/dev/null || echo '{"offline":true}')
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ Check whether this PR's claimed VERSION still points at a free slot in the queue
|
||||||
BRANCH_VERSION=$(git show HEAD:VERSION 2>/dev/null | tr -d '\r\n[:space:]' || echo "")
|
BRANCH_VERSION=$(git show HEAD:VERSION 2>/dev/null | tr -d '\r\n[:space:]' || echo "")
|
||||||
BASE_BRANCH=$(gh pr view --json baseRefName -q .baseRefName 2>/dev/null || echo main)
|
BASE_BRANCH=$(gh pr view --json baseRefName -q .baseRefName 2>/dev/null || echo main)
|
||||||
BASE_VERSION=$(git show origin/$BASE_BRANCH:VERSION 2>/dev/null | tr -d '\r\n[:space:]' || echo "")
|
BASE_VERSION=$(git show origin/$BASE_BRANCH:VERSION 2>/dev/null | tr -d '\r\n[:space:]' || echo "")
|
||||||
QUEUE_JSON=$(bun run bin/gstack-next-version \
|
QUEUE_JSON=$(bun run ~/.claude/skills/gstack/bin/gstack-next-version \
|
||||||
--base "$BASE_BRANCH" \
|
--base "$BASE_BRANCH" \
|
||||||
--bump patch \
|
--bump patch \
|
||||||
--current-version "$BASE_VERSION" 2>/dev/null || echo '{"offline":true}')
|
--current-version "$BASE_VERSION" 2>/dev/null || echo '{"offline":true}')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue