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

[CI] Nightly Restart fails due to Non-Fast-Forward Error in Changelog Pipeline #10912

Closed
amrita-shrestha opened this issue Jan 22, 2025 · 5 comments · Fixed by #10960
Closed
Assignees
Labels

Comments

@amrita-shrestha
Copy link
Contributor

amrita-shrestha commented Jan 22, 2025

Currently, the nightly run cannot be restarted if it fails, particularly due to issues in the changelog pipeline. When attempting to restart, the process fails because the nightly branch is behind the latest branch, resulting in a non-fast-forward error.

Most of the time, before restarting the nightly run, a pull request (PR) gets merged, causing the local nightly branch to fall behind the remote branch.

Build:

Image

@phil-davis
Copy link
Contributor

Maybe you can change .drone.star so that the changelog pipeline is not run in the nightly build. The nightly build is only for verification of test results, it should not "rebuild" the changelog anyway.

Or just adjust the "changelog" pipeline so that it does not do the "publish" step when running as "nightly".

The failing sequence is probably because changelog pipeline detects an extra change, which has arrived in master recently, and generates the changes for the changelog, then tries to push the changed changelog. But that fails because the latest master branch already has a new commit with the changed changelog.

@saw-jan
Copy link
Member

saw-jan commented Jan 23, 2025

Most of the time, before restarting the nightly run, a pull request (PR) gets merged, causing the local nightly branch to fall behind the remote branch.

The transifex commit (automatic - runs nightly) is one of the main reasons for the commit head change. PR merge is a rare case.

@saw-jan
Copy link
Member

saw-jan commented Jan 23, 2025

Maybe you can change .drone.star so that the changelog pipeline is not run in the nightly build. The nightly build is only for verification of test results, it should not "rebuild" the changelog anyway.

yeah, we do not run the changelog pipeline in the nightly build of desktop-client ci: https://drone.owncloud.com/owncloud/client/20262

@saw-jan
Copy link
Member

saw-jan commented Feb 3, 2025

@kobergj Is it okay to disable the changelog pipeline for nightly CI runs?

@kobergj
Copy link
Collaborator

kobergj commented Feb 3, 2025

Yes. We don't need the changelog pipline in nightly ci runs. 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging a pull request may close this issue.

5 participants