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.

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

chore(ci): fix merge conflicts #4634

Merged
merged 1 commit into from
Sep 19, 2024
Merged

chore(ci): fix merge conflicts #4634

merged 1 commit into from
Sep 19, 2024

Conversation

tasso94
Copy link
Member

@tasso94 tasso94 commented Sep 19, 2024

related to camunda/team-automation-platform#191

@tasso94 tasso94 added the ci:no-build Prevents any CI stage from running. label Sep 19, 2024
@tasso94 tasso94 self-assigned this Sep 19, 2024
@tasso94
Copy link
Member Author

tasso94 commented Sep 19, 2024

Hey @mboskamp, I guess something went wrong after merging the previous PR. These changes looked still fine to me e9cd42f but they didn't end up correctly on master. I didn't run the PR CI to speed things up. Let's merge it when the changes look good and see if the problem is resolved.

mboskamp
mboskamp approved these changes Sep 19, 2024
View reviewed changes
Copy link
Member

@mboskamp mboskamp left a comment

Choose a reason for hiding this comment

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

👍 The platform-jdk-jdk-*-latest stages should not use declarative pod specs

@tasso94 tasso94 merged commit 3b1f3b0 into master Sep 19, 2024
4 checks passed
@tasso94 tasso94 deleted the 191-declarative-pod-specs-merge-conflicts branch September 19, 2024 06:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mboskamp mboskamp mboskamp approved these changes

Assignees

@tasso94 tasso94

Labels
ci:no-build Prevents any CI stage from running.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tasso94 @mboskamp