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.

Sign up for GitHub

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

Jump to bottom

Fixup a merge issue #1232

Merged
merged 1 commit into from
May 6, 2024
Merged

Fixup a merge issue #1232

merged 1 commit into from
May 6, 2024

Conversation

CannonLock
Copy link
Contributor

No description provided.

@CannonLock CannonLock requested a review from haoming29 May 6, 2024 17:07
@CannonLock
Copy link
Contributor Author

CannonLock commented May 6, 2024 •
edited
Loading

@haoming29 This removes some code that leaked in when I merge in previous changes. This code is now on the form.tsx page.

The test failure doesn't make much sense to me because I deleted the code that it is erroring on.

@haoming29
Copy link
Contributor

haoming29 commented May 6, 2024 •
edited
Loading

@haoming29 This removes some code that leaked in when I merge in previous changes. This code is now on the form.tsx page.

The test failure doesn't make much sense to me because I deleted the code that it is erroring on.

That failure could be a caching issue. Removed the GHA cache for macOS and see if that helps

Sorry I misread, it's the Ubuntu one that causes failure, will remove that one instead

@haoming29
Copy link
Contributor

haoming29 commented May 6, 2024 •
edited
Loading

It seems like the error is in the base code, which should be the latest main, and it won't fix itself until we made the merge. Will merge this PR and see if this helps.

haoming29
haoming29 approved these changes May 6, 2024
View reviewed changes
Copy link
Contributor

@haoming29 haoming29 left a comment

Choose a reason for hiding this comment

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

LGTM

@haoming29 haoming29 merged commit d708ec3 into PelicanPlatform:main May 6, 2024
18 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@haoming29 haoming29 haoming29 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@CannonLock @haoming29