fix: Use HeadRepo instead of BaseRepo in --skip-clone-no-changes flow (#3891)#3900
Merged
jamengual merged 15 commits intorunatlantis:mainfrom Oct 22, 2025
Merged
Conversation
github-actions
bot
added
provider/azuredevops
go
Contributor
|
did you ever tried this : https://www.runatlantis.io/docs/server-configuration.html#checkout-depth |
Contributor
Author
|
I did not, but I was able to confirm that hasRepoCfg is always false for fork PRs. Since that is the case a clone will always performed, which seems to contradict the docs for Can you elaborate on how |
Contributor
I thought your concern was the size of the clone and not the amount of git clone invocations |
Contributor
Author
The size is not an issue if Without this change the call to Since deploying this branch yesterday, many forked PRs have skipped the cloning flow: Logs |
Contributor
Author
|
Hi @jamengual, just bumping this thread in hopes this bug fix can get merged in! |
Member
|
@Ulminator Can you resolve the file conflict and we'll get this in the next patch release. Thanks |
GenPage
previously approved these changes
Dec 12, 2023
GenPage
added
bug
auto-merge was automatically disabled
December 18, 2023 20:11
Head branch was pushed to by a user without write access
Ulminator
force-pushed
the
skip_clone_no_changes_fork_prs
branch
from
a0ca05d to
5e40641
Compare
Contributor
Author
|
@GenPage just letting you know that I fixed the merge conflicts! |
Ulminator
force-pushed
the
skip_clone_no_changes_fork_prs
branch
from
5e40641 to
aa58a11
Compare
Ulminator
requested review from
X-Guardian and
nitrocode
and removed request for
a team
Ulminator
commented
Oct 22, 2024
| func (c *GiteaClient) GetFileContent(logger logging.SimpleLogging, pull models.PullRequest, fileName string) (bool, []byte, error) { | ||
| logger.Debug("Getting file content for %s in Gitea pull request %d", fileName, pull.Num) | ||
|
|
||
| content, resp, err := c.giteaClient.GetContents(pull.BaseRepo.Owner, pull.BaseRepo.Name, pull.HeadCommit, fileName) |
Contributor
Author
There was a problem hiding this comment.
With this change removing the models.PullRequest from the interface I opted to changing the head commit here to the branch name which seems to be supported by the docs.
https://pkg.go.dev/code.gitea.io/sdk/gitea#Client.GetContents
The name of the commit/branch/tag. Default the repository’s default branch (usually master)
Contributor
Author
|
@runatlantis/maintainers I know this has been stagnant for awhile, but I'd really like to get this merged. Since I originally wrote this PR the |
Signed-off-by: PePe Amengual <[email protected]>
Contributor
|
@Ulminator do you have time to finish this? |
|
This issue is stale because it has been open for 1 month with no activity. Remove stale label or comment or this will be closed in 1 month. |
vvillar-epam
approved these changes
Sep 24, 2025
Signed-off-by: Matt Ulmer <[email protected]>
Signed-off-by: Matt Ulmer <[email protected]>
Ulminator
changed the title
--skip-clone-no-changes flow (#3891)
Ulminator
changed the title
--skip-clone-no-changes flow (#3891)
Contributor
Author
|
Hey @X-Guardian & @jamengual ! Apologies for taking so long to come back around to this PR. I have addressed all comments and this should be good for another look + hopefully get merged. Please let me know if you need anything else! |
Contributor
|
LGTM, just make sure to add signoff to your commits, it looks like DCO is failing https://github.com/runatlantis/atlantis/pull/3900/checks?check_run_id=53298787867 |
lukemassa
approved these changes
Oct 22, 2025
Contributor
Author
|
Thanks for the review/approval @lukemassa ! The DCO check seems to be failing due to the top |
Contributor
|
Thanks @Ulminator for the contributor |
Contributor
Author
|
Thank you @jamengual ! I'm so glad to finally get this merged 😄 |
dimisjim
pushed a commit
to dimisjim/atlantis
that referenced
this pull request
Oct 29, 2025
…runatlantis#3891) (runatlantis#3900) Signed-off-by: Matt Ulmer <[email protected]> Signed-off-by: PePe Amengual <[email protected]> Co-authored-by: PePe Amengual <[email protected]> Signed-off-by: dimisjim <[email protected]>
aidansteele
pushed a commit
to aidansteele/atlantis
that referenced
this pull request
Mar 12, 2026
…runatlantis#3891) (runatlantis#3900) Signed-off-by: Matt Ulmer <[email protected]> Signed-off-by: PePe Amengual <[email protected]> Co-authored-by: PePe Amengual <[email protected]>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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
This PR modifies the function signature of
VCSClient.GetFileContentand enforces that when attempting to check therepoCfgFileof theHeadBranch, theHeadRepois used instead of theBaseRepo.why
If one is using a forked repo, the
HeadBranchwill not exist on theBaseRepo(or if it does, it's not the branch you actually want).While working in a monorepo that others would fork, the disk space on the VM that Atlantis runs on quickly filled up as every PR made would be cloned. This should not happen when the
--skip-clone-no-changesflag is used, but the logic for that currently ignores fork PRs.tests
I have deployed my branch and validated that PRs from forked repos are not cloned if the files changed in them are outside project directories.
make testpassed as well.Our workflow only uses the GitHub client so the implementation of the GitLab client has not been tested.
references