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

qa: parametrize logger usages #5181

Merged
merged 6 commits into from
Dec 6, 2023

Conversation

jdrueckert
Copy link
Member

Re-does #5173 (reverting its revert #5180)

@jdrueckert
Copy link
Member Author

@soloturn let's split out the slf4j upgrade and any lazy log adjustments
thus, the remaining changes can be merged until we get the slf4j upgrade to work

@jdrueckert jdrueckert added this to the 2023 Revive - Milestone 3 milestone Nov 19, 2023
@soloturn
Copy link
Contributor

how do you want me to get a commit in here? like this #5182 ?

@jdrueckert
Copy link
Member Author

jdrueckert commented Nov 20, 2023

how do you want me to get a commit in here? like this #5182 ?

you should have permissions to work on branches on the original repo, not your fork 🤔
this should also allow you to checkout and commit on an existing branch...

if this is not the case, please tell me so I can recheck your permissions

the idea would be to remove the slf4j upgrade from this branch and open a new PR (targeting develop) with the removed changes

@soloturn
Copy link
Contributor

no right

❯ git push
ERROR: Permission to MovingBlocks/Terasology.git denied to soloturn.
fatal: Could not read from remote repository.

@jdrueckert
Copy link
Member Author

@soloturn you should've received an invitation to the ReviverWriteAccess GitHub team
Becoming a member of that team provides you with privileges to push branches and commits to the MovingBlocks/Terasology and MovingBlocks/TeraConfig repos as well as manage issues and PRs.

@soloturn soloturn force-pushed the revert-5180-revert-5173-qa/logger branch from eea3a59 to 09d3039 Compare November 25, 2023 05:20
@soloturn
Copy link
Contributor

soloturn commented Nov 25, 2023

redone, there is one line less than in the original, failing one. engine/build.gradle stays on slf4j-1.7.36, @jdrueckert. for details see 7f4e40f and #5182.

@soloturn soloturn force-pushed the revert-5180-revert-5173-qa/logger branch from 09d3039 to 9fabe91 Compare November 25, 2023 05:35
@soloturn soloturn force-pushed the revert-5180-revert-5173-qa/logger branch from 9fabe91 to 425bbee Compare December 3, 2023 20:37
gradle does not care about the logger definition in engine-tests, it
uses the one from engine also for the tests. remove it to not confuse.
Comment on lines -65 to -67
implementation('org.slf4j:slf4j-api:1.7.36') {
because('a backend-independent Logger')
}
Copy link
Member Author

Choose a reason for hiding this comment

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

@soloturn why are we removing this here?

Copy link
Member Author

Choose a reason for hiding this comment

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

only saw your comment now...

tested, and it is indeed not even used. so remove. also reverted back jul-to-slf4j.

so you're saying we don't use slf4j for our test stuff? interesting... what's used for logging in tests instead then? 🤔
I thought I saw logs in some tests, but maybe I misremember?

Copy link
Contributor

@soloturn soloturn Dec 5, 2023

Choose a reason for hiding this comment

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

slf4j comes into engine-tests via engine whose version wins. a lot of tohers bring slf4j in differing version as well, like gestalt, jnbullet, nui, nui-reflect, nui-gestatl, etc etc says gralde -q dependencies in folder engine-tests, in both compile and runtime classpath. i will be more explicit in the commit comment next time, @jdrueckert .

Copy link
Contributor

@BenjaminAmos BenjaminAmos left a comment

Choose a reason for hiding this comment

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

These changes look mostly stylistic rather than functional. The dependency upgrades seem minor and ideally shouldn't break anything. There shouldn't be much harm in merging this now.

@BenjaminAmos BenjaminAmos merged commit 0c2b722 into develop Dec 6, 2023
9 checks passed
@BenjaminAmos BenjaminAmos deleted the revert-5180-revert-5173-qa/logger branch December 6, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

3 participants