Skip to content

fix: fix workflow for rebasing #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bougyman merged 1 commit into from
Aug 19, 2026
Merged

fix: fix workflow for rebasing #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ tracker:
kind: linear
project_slug: "94a76f2ac65f" # hex slugId from your Linear project URL
# api_key: "$LINEAR_API_KEY" # your Linear API key — agents inherit this
assignee: me # only issues assigned to the API key's user

# ---------------------------------------------------------------------------
# Linear state name mapping
Expand All @@ -100,7 +101,7 @@ linear_states:
# Polling
# ---------------------------------------------------------------------------
polling:
interval_ms: 15000 # 15 seconds between ticks
interval_ms: 60000 # 15 seconds between ticks

# ---------------------------------------------------------------------------
# Workspace
Expand All @@ -116,8 +117,14 @@ hooks:
git clone --depth 1 --recursive git@github.com:rubyists/linear-cli .
mix setup
before_run: |
set -eu
git fetch origin main
git rebase origin/main 2>/dev/null || git rebase --abort
changes="$(git status --porcelain)"
if [ -n "$changes" ]; then
echo "before_run: preserving uncommitted workspace changes; skipping rebase"
else
git rebase origin/main
fi
timeout_ms: 120000

# ---------------------------------------------------------------------------
Expand Down