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

Setting Modern as default #3305

Merged

Conversation

AsparagusEduardo
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo commented Sep 12, 2023

Description

@gruxor is happy.

make now does modern, while make agbcc compiles using agbcc. make modern still does its thing.

Discord contact info

AsparagusEduardo

@DizzyEggg
Copy link
Collaborator

The future is now

@SBird1337
Copy link
Collaborator

SBird1337 commented Sep 12, 2023

The CI seems to still build tests with agbcc. (But also they are currently broken on modern)

@mrgriffin
Copy link
Collaborator

The CI seems to still build tests with agbcc. (But also they are currently broken on modern)

Oh yeah... idk how others feel, but I'd really want the tests to run and pass before we merge this PR.

There was a tiny amount of discussion on Discord, but nothing particularly helpful. I haven't had the time to look into this, but a reasonable first step might be to look at the failing tests running in a visual mgba.

@AsparagusEduardo
Copy link
Collaborator Author

Oh yeah... idk how others feel, but I'd really want the tests to run and pass before we merge this PR.

I completely agree.

@AsparagusEduardo AsparagusEduardo marked this pull request as draft September 12, 2023 22:01
@AsparagusEduardo
Copy link
Collaborator Author

Set as draft until tests work on modern.

@AsparagusEduardo AsparagusEduardo marked this pull request as ready for review October 13, 2023 21:36
@AsparagusEduardo
Copy link
Collaborator Author

CI set to Modern and tests pass :)

@AsparagusEduardo AsparagusEduardo marked this pull request as draft October 14, 2023 12:47
@AsparagusEduardo AsparagusEduardo marked this pull request as ready for review October 15, 2023 01:57
mrgriffin
mrgriffin previously approved these changes Oct 23, 2023
Copy link
Collaborator

@mrgriffin mrgriffin left a comment

Choose a reason for hiding this comment

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

Time to merge this? 👀

@SBird1337
Copy link
Collaborator

Can we rebase to upcoming one more time to get CI confirmation? :)

@mrgriffin
Copy link
Collaborator

mrgriffin commented Oct 23, 2023

EDIT: SBird already PRed this to upcoming, so just merging upcoming into this PR should be fine.

Can we rebase to upcoming one more time to get CI confirmation? :)

Good call, it's complaining about my ModifyPersonalityForNature test :kekw:

diff --git a/test/battle/trainer_control.c b/test/battle/trainer_control.c
index 99bea0e8cc..192b12980c 100644
--- a/test/battle/trainer_control.c
+++ b/test/battle/trainer_control.c
@@ -123,7 +123,7 @@ TEST("CreateNPCTrainerPartyForTrainer generates different personalities for diff
 
 TEST("ModifyPersonalityForNature can set any nature")
 {
-    u32 personality, nature, j, k;
+    u32 personality = 0, nature = 0, j, k;
     for (j = 0; j < 64; j++)
     {
         for (k = 0; k < NUM_NATURES; k++)

@Jaizu
Copy link

Jaizu commented Oct 24, 2023

I think this PR is broken and needs this 2 aditional changes... right? If someone more savy than me with makefiles can confirm I would be grateful.
image

@mrgriffin
Copy link
Collaborator

I think this PR is broken and needs this 2 aditional changes... right? If someone more savy than me with makefiles can confirm I would be grateful.

Yeah that sounds right. .PHONY is needed because otherwise touch agbcc will mean make agbcc does nothing (until one of its dependencies changes). And building the tools is obviously necessary.

@AsparagusEduardo
Copy link
Collaborator Author

Yeah that sounds right. .PHONY is needed because otherwise touch agbcc will mean make agbcc does nothing (until one of its dependencies changes). And building the tools is obviously necessary.

I'm out until Friday, so someone can PR to this PR the merge with upcoming plus these changes and I'll accept it.

@mrgriffin
Copy link
Collaborator

I'm out until Friday, so someone can PR to this PR the merge with upcoming plus these changes and I'll accept it.

AsparagusEduardo#24

@mrgriffin mrgriffin merged commit 81cbbdb into rh-hideout:upcoming Oct 24, 2023
1 check passed
@AsparagusEduardo AsparagusEduardo deleted the RHH/pr/upcoming/modern branch October 24, 2023 12:31
@AsparagusEduardo
Copy link
Collaborator Author

agsmgmaster64 added a commit to agsmgmaster64/worldlinkdeluxe-ame that referenced this pull request Oct 25, 2023
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.

None yet

5 participants