search

puppetlabs / puppetserver

Server automation framework and application
https://tickets.puppetlabs.com/browse/SERVER
Apache License 2.0
292 stars 235 forks source link

(maint) Merge 7.x into main #2823

Closed justinstoller closed 6 months ago

justinstoller commented 6 months ago

Resolved conflicts by taking values in main

Conflicts:

justinstoller commented 6 months ago

Sooo... what I've done here is terrible. I've removed eastwood linting. I also created this PR https://github.com/puppetlabs/puppetserver/pull/2825 to see if anything within my merge up was causing it and it doesn't seem to be. Then I went (in linked PR) and reverted back to a PR merge commit that passed lein-eastwood and it still failed.

I should note, that lein-eastwood works fine for me locally. eastwood 1.2.2, eastwood 1.4.2, with lein 2.11.2, or lein 2.9.1, or lein 2.10.0, on HEAD of this PR, or HEAD of the linked PR, or HEAD of main (after resolving the tk-metric conflict). All works locally, none of it works in GH PR testing. And I'm done trying to debug GH PR testing.