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

HSEARCH-4947 Make sure that nested jars can be read on Windows #3730

Merged
merged 10 commits into from
Sep 22, 2023
Merged

HSEARCH-4947 Make sure that nested jars can be read on Windows #3730

merged 10 commits into from
Sep 22, 2023

Conversation

marko-bekhta
Copy link
Member

@marko-bekhta marko-bekhta commented Sep 19, 2023 •
edited
Loading

https://hibernate.atlassian.net/browse/HSEARCH-4947

The idea here is that since we are trying to construct a URI then we should construct it from the URI 😃
Since in the case of Linux Path path would have the same / that is needed for a URI, but then in Windows, it'll be \, and URI construction won't work...
And the same is about the test updates; the changes are to make the asserts compare the URIs rather than Path vs URI

I've reverted the ORM version to 6.2 series to test the spring boot uberjar module -- the tests passed with these changes.

yrodiere
yrodiere approved these changes Sep 19, 2023
View reviewed changes
Copy link
Member

@yrodiere yrodiere left a comment

Choose a reason for hiding this comment

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

LGTM, but let's merge #3729 first and rebase this one, so we can run the relevant tests on the Windows CI.

@yrodiere yrodiere added the Waiting for other pull request Based on another PR that should be merged first label Sep 19, 2023
@yrodiere
Copy link
Member

@marko-bekhta Can you please open a backport PR for 6.2?

@yrodiere yrodiere mentioned this pull request Sep 19, 2023
Closed
@marko-bekhta
Copy link
Member Author

ok will do it once we run this with Win tests on CI 😃

@yrodiere yrodiere mentioned this pull request Sep 19, 2023
Merged
@yrodiere
Copy link
Member

@marko-bekhta You can rebase now :)

@yrodiere yrodiere added Needs rebase and removed Waiting for other pull request Based on another PR that should be merged first labels Sep 19, 2023
@marko-bekhta marko-bekhta force-pushed the fix/HSEARCH-4947-windows-jars branch from f78d814 to 07d6083 Compare September 19, 2023 10:28
@yrodiere
Copy link
Member

... and powershell doesn't support escaping newlines, nice. I'll push a fix to your branch.

@yrodiere yrodiere force-pushed the fix/HSEARCH-4947-windows-jars branch from 07d6083 to bba89b3 Compare September 19, 2023 11:06
@hibernate-github-bot
Copy link

hibernate-github-bot bot commented Sep 19, 2023 •
edited
Loading

Thanks for your pull request!

This pull request does not follow the contribution rules. Could you have a look?

❌ All commit messages should start with a JIRA issue key matching pattern HSEARCH-\d+
    ↳ Offending commits: [7b705ae, d87e279, f5f7ff9, 56b8adf, 9935d28, 8071280, 6ddd501, f70f01f]

› This message was automatically generated.

@yrodiere yrodiere force-pushed the fix/HSEARCH-4947-windows-jars branch 2 times, most recently from 11a84c9 to 5f4d402 Compare September 20, 2023 07:09
@yrodiere
Copy link
Member

I disabled Elasticsearch tests on Windows, because of actions/runner-images#1143 (comment)

Let's see if tests using the stub and Lucene backends pass, at least.

@yrodiere yrodiere force-pushed the fix/HSEARCH-4947-windows-jars branch 3 times, most recently from e0473b3 to 52786f1 Compare September 20, 2023 07:16
@yrodiere yrodiere force-pushed the fix/HSEARCH-4947-windows-jars branch from 52786f1 to 7be2065 Compare September 20, 2023 09:46
@marko-bekhta marko-bekhta force-pushed the fix/HSEARCH-4947-windows-jars branch from 7be2065 to 4562161 Compare September 20, 2023 13:25
@marko-bekhta
Copy link
Member Author

I've rebased this PR and removed ElasticsearchSchemaManagerExporterIT and LuceneSchemaManagerExporterIT from the it-multiplebackends run since they require the backend to be set explicitly. We are testing the backend-specific schema export in corresponding backend runs ....

@yrodiere
Copy link
Member

yrodiere commented Sep 20, 2023 •
edited
Loading

I've rebased this PR and removed ElasticsearchSchemaManagerExporterIT and LuceneSchemaManagerExporterIT from the it-multiplebackends run

Right, that's what I meant to do to begin with... sorry :/

@yrodiere
Force the use of bash even on Windows for GitHub Actions
7b705ae 
Powershell would not support escaping newlines,
and would interpret dots as some object-oriented field accessor.
None of this nonsense, let's just use bash.
@yrodiere
Change Maven config to allow skipping Lucene or Elasticsearch tests f…
d87e279 
…rom the Maven CLI
@yrodiere
Skip Elasticsearch tests on the GitHub Actions Windows build
f5f7ff9
@yrodiere
Skip docker-maven-plugin completely on GitHub Action's Windows VMs
56b8adf
@yrodiere
Skip performance tests on Windows
9935d28 
For some reason they don't work
@yrodiere
Fix test filters for Windows
8071280 
The documentation states that we should only get forward slashes here,
but that doesn't seem to be the case.
@yrodiere yrodiere force-pushed the fix/HSEARCH-4947-windows-jars branch from 4562161 to e2ec030 Compare September 20, 2023 15:07
@marko-bekhta
Copy link
Member Author

Thanks 😃 I was just about to look at the outbox polling tests 🙈
🤞🏻🤞🏻🤞🏻

@yrodiere yrodiere force-pushed the fix/HSEARCH-4947-windows-jars branch 2 times, most recently from d4f7212 to addd210 Compare September 21, 2023 14:34
@yrodiere
Copy link
Member

yrodiere commented Sep 21, 2023 •
edited
Loading

FYI the outbox-polling tests now get executed, but some of them fail on Windows for some reason... and it's hard to know what's going on because we don't get a build report because of actions/upload-artifact#240 🙄
I tried to find a workaround to actually upload a build report, and I'll try to see what's going on.

@yrodiere yrodiere force-pushed the fix/HSEARCH-4947-windows-jars branch from addd210 to 6b18883 Compare September 21, 2023 15:38
@yrodiere yrodiere force-pushed the fix/HSEARCH-4947-windows-jars branch from 6b18883 to fb1bdab Compare September 22, 2023 06:09
@yrodiere
Copy link
Member

Ok, I disabled the outbox-polling tests on Windows for now and created https://hibernate.atlassian.net/browse/HSEARCH-4965 to investigate the failures later.
If the build passes now, let's merge.
Sorry for the delays.

@sonarcloud
Copy link

sonarcloud bot commented Sep 22, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@yrodiere yrodiere merged commit e42f81d into hibernate:main Sep 22, 2023
10 of 11 checks passed
@yrodiere yrodiere mentioned this pull request Sep 22, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yrodiere yrodiere yrodiere 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
@marko-bekhta @yrodiere