adityamparikh commented on PR #35: URL: https://github.com/apache/solr-mcp/pull/35#issuecomment-5151206979
Rebased onto `main` (`a57f4d9`) — conflicts resolved, `./gradlew build` green (352 tests, 0 failures). **Merge ordering: this should land after #136.** Both PRs rewrite the same line in `build.gradle.kts` — #136 sets `version = "1.0.0"`, this one replaces it with `version = semver.version`. They're semantically opposed (manual pin vs. automatic derivation), so whichever merges second will conflict. The intent is #136 cuts 1.0.0 manually, then this takes over from 1.0.1/1.1.0 onward. I've updated the initial-version comment here to assume a `v1.0.0` baseline tag rather than `v0.0.0`. **Two things worth flagging from the rebase:** 1. Upstream #153 removed the Docker-publishing job from `build-and-publish.yml`. I accepted that deletion, which means this PR's `printVersion`/tag-computation edits — they lived inside that job — are gone. Only the `fetch-depth: 0` checkout change remains in that file. Official images are still published by `release-publish.yml`. 2. While verifying, I found `cut-release.yml` claimed in three places that pushing a release tag triggers `build-and-publish.yml` to publish images. Neither half holds: `build-and-publish.yml` has no `tags:` trigger (and in fact **no workflow in this repo fires on a tag push**), and it no longer publishes images. The step-summary line was the worst of the three, since it told a maintainer running the workflow that images were publishing when nothing ran. Fixed in `443ce1e` to describe actual behavior. Point 2 was pre-existing in this branch, not rebase fallout — worth a look at whether something *should* run on release tags. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
