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: merge deploy and auto-merge workflows into unified CI workflow #10616

Merged
merged 2 commits into from
Oct 10, 2022

Conversation

lenaschoenburg
Copy link
Member

@lenaschoenburg lenaschoenburg commented Oct 6, 2022

This merges the deploy, auto-merge and test workflows into one CI workflow. This fixes #10503 because codeql will run within the same workflow on main and in PRs, getting the CodeQL workflow to pass again.

Additionally, some conditions and job dependencies are a bit simpler now.

@lenaschoenburg lenaschoenburg marked this pull request as ready for review October 6, 2022 07:44
The test summary job already depends on java checks and go linting.
Copy link
Contributor

@megglos megglos left a comment

Choose a reason for hiding this comment

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

Nice that you addressed this immediately! I also like the revised naming, Tests didn't really fit anymore anyway as there where also code quality jobs inside etc.

.github/workflows/ci.yml Show resolved Hide resolved
@lenaschoenburg
Copy link
Member Author

bors merge

@zeebe-bors-camunda zeebe-bors-camunda bot merged commit ce68a1d into main Oct 10, 2022
@zeebe-bors-camunda zeebe-bors-camunda bot deleted the os-fix-codeql branch October 10, 2022 14:42
@zeebe-bors-camunda
Copy link
Contributor

Build succeeded:

@backport-action
Copy link
Collaborator

Backport failed for stable/8.0, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin stable/8.0
git worktree add -d .worktree/backport-10616-to-stable/8.0 origin/stable/8.0
cd .worktree/backport-10616-to-stable/8.0
git checkout -b backport-10616-to-stable/8.0
ancref=$(git merge-base cf78d1bdca3bde04308523d5acd820a274c514bf db3f85a0d7673c2345566625c3bb6965e9063065)
git cherry-pick -x $ancref..db3f85a0d7673c2345566625c3bb6965e9063065

@backport-action
Copy link
Collaborator

Backport failed for stable/8.1, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin stable/8.1
git worktree add -d .worktree/backport-10616-to-stable/8.1 origin/stable/8.1
cd .worktree/backport-10616-to-stable/8.1
git checkout -b backport-10616-to-stable/8.1
ancref=$(git merge-base cf78d1bdca3bde04308523d5acd820a274c514bf db3f85a0d7673c2345566625c3bb6965e9063065)
git cherry-pick -x $ancref..db3f85a0d7673c2345566625c3bb6965e9063065

zeebe-bors-camunda bot added a commit that referenced this pull request Oct 10, 2022
10657: [Backport stable/8.0] ci: merge deploy and auto-merge workflows into unified CI workflow r=oleschoenburg a=oleschoenburg

manual backport of #10616

10659: [Backport stable/8.0] fix(raft): do not handle response if the role is closed r=oleschoenburg a=deepthidevaki

## Description

Backports #10640 

Changes to the `ControlledRaftContext` is not backported as the original code does not exist in this version. 

closes #10545 

Co-authored-by: Ole Schönburg <ole.schoenburg@gmail.com>
Co-authored-by: Deepthi Devaki Akkoorath <deepthidevaki@gmail.com>
zeebe-bors-camunda bot added a commit that referenced this pull request Oct 10, 2022
10658: [Backport stable/8.1] ci: merge deploy and auto-merge workflows into unified CI workflow r=oleschoenburg a=oleschoenburg

manual backport of #10616

Co-authored-by: Ole Schönburg <ole.schoenburg@gmail.com>
zeebe-bors-camunda bot added a commit that referenced this pull request Oct 10, 2022
10658: [Backport stable/8.1] ci: merge deploy and auto-merge workflows into unified CI workflow r=oleschoenburg a=oleschoenburg

manual backport of #10616

Co-authored-by: Ole Schönburg <ole.schoenburg@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Auto merge fails because of unexpected check outcome
3 participants