Skip to content

Set project merge-mode to rebase #519

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.

Sign up for GitHub

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

Jump to bottom
Merged
lbarcziova merged 1 commit into from
Dec 15, 2025
Merged

Set project merge-mode to rebase #519

lbarcziova merged 1 commit into from
Dec 15, 2025

Conversation

@fserucas
Copy link
Contributor

@fserucas fserucas commented Dec 15, 2025

No description provided.

@centosinfra-prod-github-app
Copy link

centosinfra-prod-github-app bot commented Dec 15, 2025

Zuul encountered a syntax error while parsing its
configuration in the repo packit/dashboard on branch main. The
problem was:

Job pre-commit not defined

The problem appears in the the "github.com/packit/dashboard" project stanza:

project:
merge-mode: rebase
check:
jobs:
- pre-commit
# - dashboard-tests
gate:
jobs:
- pre-commit
...

in "packit/dashboard/.zuul.yaml@main", line 2

@usercont-release-bot
Copy link

usercont-release-bot commented Dec 15, 2025 •
edited
Loading

Preview: https://packit-dashboard-pr-519.surge.sh (deployed at Mon 15 Dec 2025, 10:38 UTC)

@softwarefactory-project-zuul
Copy link
Contributor

softwarefactory-project-zuul bot commented Dec 15, 2025

Build succeeded.
https://softwarefactory-project.io/zuul/t/packit-service/buildset/f8b031f1e4b048799a399b4308b973a0

✔️ pre-commit SUCCESS in 1m 28s

@fserucas
Copy link
Contributor Author

fserucas commented Dec 15, 2025

recheck

@softwarefactory-project-zuul
Copy link
Contributor

softwarefactory-project-zuul bot commented Dec 15, 2025

Build succeeded.
https://softwarefactory-project.io/zuul/t/packit-service/buildset/1b2f1236bad64d489db0119244a7a875

✔️ pre-commit SUCCESS in 1m 27s

@centosinfra-prod-github-app
Copy link

centosinfra-prod-github-app bot commented Dec 15, 2025

Build succeeded.
https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/packit-service/buildset/2a8af137413445e9baaaa76627c412b0

✔️ pre-commit SUCCESS in 1m 30s (non-voting)

lbarcziova
lbarcziova reviewed Dec 15, 2025
View reviewed changes
Copy link
Member

@lbarcziova lbarcziova left a comment

Choose a reason for hiding this comment

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

thanks! Can you please just put in the commit message why is this needed?

@fserucas
Set project merge-mode to rebase
2e34b21 
This change sets the merge mode used by Git in this project.
The mode should match the remote system, that in this project is
GitHub.
"rebase" mode, rebase the changes onto the branch when merging.
@fserucas
Copy link
Contributor Author

fserucas commented Dec 15, 2025

Commit message updated

@lbarcziova lbarcziova enabled auto-merge December 15, 2025 10:39
@centosinfra-prod-github-app
Copy link

centosinfra-prod-github-app bot commented Dec 15, 2025

Build succeeded.
https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/packit-service/buildset/6685cd5bbef446e58b43a4f3ed8d3fcf

✔️ pre-commit SUCCESS in 1m 31s

@lbarcziova lbarcziova added this pull request to the merge queue Dec 15, 2025
Merged via the queue into packit:main with commit df9d999 Dec 15, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lbarcziova lbarcziova lbarcziova approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fserucas @usercont-release-bot @lbarcziova