Fix pub ecosystem Flutter dependency_services execution by applying --force checkout
#11762
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kbukum1
force-pushed
the
kamil/fix-pub-ecosystem-running-dependency-services-issue
branch
from
a2a9073 to
aa0c034
Compare
kbukum1
force-pushed
the
kamil/fix-pub-ecosystem-running-dependency-services-issue
branch
from
b507dc4 to
b397b9f
Compare
kbukum1
changed the title
pub ecosystem running flutter dependency_services execution directory--force checkout
kbukum1
commented
Mar 7, 2025
| if File.directory?("/tmp/flutter/.git") | ||
| Dependabot.logger.info "Flutter repo already exists at /tmp/flutter." | ||
| return | ||
| end |
There was a problem hiding this comment.
Review Tip: Added logging to help for support
kbukum1
commented
Mar 7, 2025
| else | ||
| Dependabot.logger.error "Cloning Flutter failed: #{stderr}" | ||
| raise Dependabot::DependabotError, "Cloning Flutter failed: #{stderr}" | ||
| end |
There was a problem hiding this comment.
Review Tip: Added logging to help for support
kbukum1
commented
Mar 7, 2025
| unless status.success? | ||
| Dependabot.logger.error "Fetching Flutter version failed: #{stderr}" | ||
| raise Dependabot::DependabotError, "Fetching Flutter version #{ref} failed: #{stderr}" | ||
| end |
There was a problem hiding this comment.
Review Tip: Added logging to help for support
kbukum1
commented
Mar 7, 2025
|
|
||
| # Check out the right version in git. | ||
| _, stderr, status = Open3.capture3( | ||
| {}, | ||
| "git", | ||
| "checkout", | ||
| "--force", | ||
| ref, |
There was a problem hiding this comment.
Review Tip: This is actual change we are applying.
kbukum1
commented
Mar 7, 2025
| else | ||
| Dependabot.logger.error "Checking out Flutter version failed: #{stderr}" | ||
| raise Dependabot::DependabotError, "Checking out Flutter #{ref} failed: #{stderr}" | ||
| end |
There was a problem hiding this comment.
Review Tip: Added logging to help for support
kbukum1
commented
Mar 7, 2025
| unless status.success? | ||
| Dependabot.logger.error "Error executing dependency_services: #{stderr}" | ||
| raise_error(stderr) | ||
| end |
There was a problem hiding this comment.
Review Tip: Added logging to help for support
kbukum1
commented
Mar 7, 2025
| @@ -218,6 +235,8 @@ def run_flutter_version | |||
|
|
|||
| def run_dependency_services(command, stdin_data: nil) | |||
| SharedHelpers.in_a_temporary_directory do |temp_dir| | |||
| Dependabot.logger.info "Running dependency_services in temporary directory: #{temp_dir}" | |||
|
|
|||
There was a problem hiding this comment.
Review Tip: Added logging to help for support
Closed
5 tasks
abdulapopoola
approved these changes
Mar 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What are you trying to accomplish?
This PR fixes an issue where
dependency_servicesexecution was failing due to uncommitted changes inbin/internal/engine.versionwithin the Flutter repo used by Dependabot. The error occurred when checking out a new Flutter version, as Git refused to overwrite local changes.To resolve this, we now apply
--forcewhen checking out the Flutter version, ensuring that the working directory is reset before switching versions.This fixes the issue where updates were failing locally and possibly affecting automated dependency updates.
Anything you want to highlight for special attention from reviewers?
The actual business logic change is highlighted below, while the other modifications are only improvements to support logs.https://github.com/dependabot/dependabot-core/pull/11762/files#diff-e7529ea532fe965f931719cfb7b78a2644ad3b2b69e9345c6de3b9a3bca8c317R151
The fix forces the checkout of the Flutter repository version, preventing conflicts caused by untracked or modified files.
While this ensures updates proceed successfully, reviewers should verify if
--forcehas any unintended side effects.Local testing confirmed the issue is resolved, but additional validation on other failing repositories is needed.
How will you know you've accomplished your goal?
Checklist