Skip to content
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.

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

Getting error "Current commit is behind, skipping the release to avoid collisions" #2463

Open
ykhandelwal913 opened this issue Jun 21, 2024 · 3 comments
Labels
bug Something isn't working

Comments

@ykhandelwal913
Copy link
Collaborator

ykhandelwal913 commented Jun 21, 2024

Describe the bug
We often see the error while using auto shipit that "Current commit is behind, skipping the release to avoid collisions". This happens when the CI running the current commit and another commit got merged/updated in the main branch. How can we avoid this collisions. Is there any flag available to not to check if branch is upToDate? Or any other way to resolve the mentioned issue.

To Reproduce

  • Commit a changes in main branch and let the CI kick in.
  • when auto shipit try to release the version, update main branch with another commit.
  • auto shipit fails with "Current commit is behind, skipping the release to avoid collisions"

Expected behavior

  • It should lock the main branch to avoid branch being updated or dont check for updation of the main branch(isBranchUpToDate)
  • Ideally CI should work without any issue

Screenshots

image

Environment information:
auto version: 11.1.5
cmd executed: yarn --silent auto shipit --base-branch master -vvv

Additional context

@ykhandelwal913 ykhandelwal913 added the bug Something isn't working label Jun 21, 2024
@ykhandelwal913
Copy link
Collaborator Author

@hipstersmoothie can you help with above issue.

@mijdavis2
Copy link

I have the same issue every time I setup a new repo. This didn't happen before. Followed the setup docs to the letter.

@NeilzonC
Copy link

NeilzonC commented Sep 9, 2024

This line of code resolved this issue for me
https://intuit.github.io/auto/docs/build-platforms/github-actions

- name: Prepare repository
        run: git fetch --unshallow --tags

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

3 participants