Skip to content

Switch to TeamCity and Qodana#822

Closed
DRSchlaubi wants to merge 75 commits intomainfrom
feature/teamcity
Closed

Switch to TeamCity and Qodana#822
DRSchlaubi wants to merge 75 commits intomainfrom
feature/teamcity

Conversation

@DRSchlaubi
Copy link
Copy Markdown
Member

No description provided.

@DRSchlaubi DRSchlaubi changed the title Feature/teamcity Switch to TeamCity and Qodana Apr 25, 2023
@lukellmann
Copy link
Copy Markdown
Member

can you merge 0.9.x into this first? will be easier to review because some changes are already on 0.9.x

michael.rittmeister@gmail.com and others added 26 commits April 25, 2023 20:47
- Remove no longer needed patch
- Add GraalVM CI skeleton
- Add DocsCI
- Update CLI command in README.md
@lukellmann
Copy link
Copy Markdown
Member

lukellmann commented Apr 25, 2023

can you merge 0.9.x into this first? will be easier to review because some changes are already on 0.9.x

thanks

Comment thread gradle/libs.versions.toml Outdated
Comment thread common/build.gradle.kts Outdated
Comment thread qodana.yaml Outdated
Comment thread .gitignore

**/build/*
!**/build/generated/
**/build/generated/**/test
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

where do these generated files come from?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I think this came from the Graal PR to prevent commiting the reflect-config.json for tests

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

can we keep graal stuff out of this pr? i think we should

@lukellmann lukellmann mentioned this pull request Apr 27, 2023
@lukellmann
Copy link
Copy Markdown
Member

there are merge conflicts now

# Conflicts:
#	.github/workflows/deployment-ci.yml
#	.github/workflows/docs-ci.yml
#	build.gradle.kts
#	buildSrc/src/main/kotlin/Projects.kt
#	buildSrc/src/main/kotlin/kord-module.gradle.kts
#	buildSrc/src/main/kotlin/kord-publishing.gradle.kts
#	common/build.gradle.kts
@lukellmann
Copy link
Copy Markdown
Member

there are merge conflicts now

resolved them

@lukellmann lukellmann changed the base branch from 0.9.x to main June 17, 2023 13:53
@DRSchlaubi DRSchlaubi mentioned this pull request Aug 5, 2023
9 tasks
@DRSchlaubi
Copy link
Copy Markdown
Member Author

Replaced by #855 and kordlib/.teamcity

@DRSchlaubi DRSchlaubi closed this Jan 30, 2024
@DRSchlaubi DRSchlaubi deleted the feature/teamcity branch March 10, 2024 15:30
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.

2 participants