Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/fork-janitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ on:
upstream_branch:
description: "Upstream branch to rebase onto"
required: false
default: "dev"
base_branch:
description: "Fork base branch for sync PRs"
required: false
default: "dev"

permissions:
contents: write
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/fork-sync-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@ on:
upstream_branch:
description: "Upstream branch to sync from"
required: false
default: "dev"
patch_branch:
description: "Fork patch branch to preserve"
required: false
default: "feat/hot-reload-smooth"
base_branch:
description: "Fork base branch to open PR into"
required: false
default: "dev"

permissions:
contents: write
Expand Down Expand Up @@ -67,9 +64,10 @@ jobs:
id: prep
run: |
set -euo pipefail
stamp="$(date -u +%Y%m%d-%H%M%S)"
upstream_sha="$(git rev-parse --short "upstream/${UPSTREAM_BRANCH}")"
sync_branch="sync/${UPSTREAM_BRANCH}-${stamp}-${upstream_sha}"
safe_patch="$(echo "${PATCH_BRANCH}" | tr '/' '-')"
safe_upstream="$(echo "${UPSTREAM_BRANCH}" | tr '/' '-')"
sync_branch="sync/${safe_patch}-onto-${safe_upstream}"
git checkout -B "$sync_branch" "origin/${PATCH_BRANCH}"
echo "sync_branch=$sync_branch" >> "$GITHUB_OUTPUT"
echo "upstream_sha=$upstream_sha" >> "$GITHUB_OUTPUT"
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/release-cli-fork.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ jobs:
fetch-depth: 0

- name: Setup Bun
uses: ./.github/actions/setup-bun
uses: oven-sh/setup-bun@v2
with:
bun-version: "1.3.9"

- name: Install dependencies
run: bun install

- name: Resolve tag and version
id: meta
Expand Down
Loading