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

Fix a bad merge between #11926 and #11399 #12022

Merged
merged 3 commits into from
Jan 8, 2025

Conversation

radeusgd
Copy link
Member

@radeusgd radeusgd commented Jan 8, 2025

Pull Request Description

Important Notes

Checklist

Please ensure that the following checklist has been satisfied before submitting the PR:

  • The documentation has been updated, if necessary.
  • Screenshots/screencasts have been attached, if there are any visual changes. For interactive or animated visual changes, a screencast is preferred.
  • All code follows the
    Scala,
    Java,
    TypeScript,
    and
    Rust
    style guides. In case you are using a language not listed above, follow the Rust style guide.
  • Unit tests have been written where possible.
  • If meaningful changes were made to logic or tests affecting Enso Cloud integration in the libraries,
    or the Snowflake database integration, a run of the Extra Tests has been scheduled.
    • If applicable, it is suggested to paste a link to a successful run of the Extra Tests.

@radeusgd radeusgd added the CI: No changelog needed Do not require a changelog entry for this PR. label Jan 8, 2025
@radeusgd radeusgd self-assigned this Jan 8, 2025
@radeusgd
Copy link
Member Author

radeusgd commented Jan 8, 2025

With the second commit I can successfully build buildEngineDistribution and the File_Spec tests are passing. Let's merge once CI is green.

@radeusgd radeusgd added CI: Ready to merge This PR is eligible for automatic merge CI: Keep up to date Automatically update this PR to the latest develop. labels Jan 8, 2025
@radeusgd radeusgd added the CI: Clean build required CI runners will be cleaned before and after this PR is built. label Jan 8, 2025
@mergify mergify bot merged commit bfd31f9 into develop Jan 8, 2025
38 of 42 checks passed
@mergify mergify bot deleted the wip/radeusgd/fix-bad-merge-2025-01 branch January 8, 2025 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: Clean build required CI runners will be cleaned before and after this PR is built. CI: Keep up to date Automatically update this PR to the latest develop. CI: No changelog needed Do not require a changelog entry for this PR. CI: Ready to merge This PR is eligible for automatic merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants