Skip to content

fix(ci): remove unnecessary rebase step causing dirty tree error in release workflow#14

Merged
pckimlong merged 2 commits into
mainfrom
copilot/fix-13
Sep 21, 2025
Merged

fix(ci): remove unnecessary rebase step causing dirty tree error in release workflow#14
pckimlong merged 2 commits into
mainfrom
copilot/fix-13

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Sep 21, 2025

The release workflow was failing with a "dirty tree" error during the rebase step. The error occurred because:

  1. The bump_version.py script modifies pubspec.yaml and CHANGELOG.md
  2. The workflow commits these changes to prepare the release
  3. The workflow then attempts to rebase onto origin/main, which conflicts with the committed changes
Run git fetch origin main
From https://github.com/pckimlong/riverboot
 * branch            main       -> FETCH_HEAD
error: cannot rebase: You have unstaged changes.
error: Please commit or stash them.
Error: Process completed with exit code 1.

Root Cause: The rebase step was unnecessary since the release workflow only runs on pushes to the main branch. There's no need to rebase when we're already working on the target branch.

Solution: Removed the "Rebase onto latest main" step from .github/workflows/release.yml. The workflow now follows a cleaner, more logical flow:

  1. Run version bump script
  2. Commit the changes
  3. Create release tag
  4. Push changes and tag
  5. Create GitHub release

This eliminates the source of the conflict while maintaining all the release functionality.

Fixes #13.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

  • https://storage.googleapis.com/flutter_infra_release/flutter/c29809135135e262a912cf583b2c90deb9ded610/dart-sdk-linux-x64.zip
    • Triggering command: curl --retry 3 --continue-at - --location --output /tmp/flutter/bin/cache/dart-sdk-linux-x64.zip REDACTED (http block)

If you need me to access, download, or install something from one of these locations, you can either:


✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Co-authored-by: pckimlong <78638472+pckimlong@users.noreply.github.com>
Copilot AI changed the title [WIP] Issue with dirty tree of that CI fix(ci): remove unnecessary rebase step causing dirty tree error in release workflow Sep 21, 2025
Copilot AI requested a review from pckimlong September 21, 2025 02:50
@pckimlong pckimlong marked this pull request as ready for review September 21, 2025 07:27
Copilot AI review requested due to automatic review settings September 21, 2025 07:27
@pckimlong pckimlong merged commit e896703 into main Sep 21, 2025
3 checks passed
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR fixes a CI workflow issue where the release workflow was failing due to a "dirty tree" error caused by an unnecessary rebase step. The workflow was attempting to rebase after committing version bump changes, which created conflicts since the workflow already runs on the main branch.

  • Removed the problematic "Rebase onto latest main" step from the release workflow
  • Simplified the release flow to avoid git conflicts while maintaining all functionality

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Issue with dirty tree of that CI

3 participants