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

ensure 5.x and 4.4 can use the same logic #311

Merged
merged 5 commits into from
Aug 22, 2023

Conversation

mollux
Copy link
Contributor

@mollux mollux commented Aug 1, 2023

No description provided.

Copy link
Member

@escopecz escopecz left a comment

Choose a reason for hiding this comment

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

👍

@mollux mollux force-pushed the speedup-compatibility-4.4-part2 branch 6 times, most recently from 4348a87 to 303602b Compare August 1, 2023 12:26
@codecov-commenter
Copy link

codecov-commenter commented Aug 1, 2023

Codecov Report

Merging #311 (39e53c6) into main (e90d511) will not change coverage.
The diff coverage is n/a.

❗ Current head 39e53c6 differs from pull request most recent head 9a45170. Consider uploading reports for the commit 9a45170 to get more accurate results

@@            Coverage Diff            @@
##               main     #311   +/-   ##
=========================================
  Coverage     52.49%   52.49%           
  Complexity      390      390           
=========================================
  Files            30       30           
  Lines          1042     1042           
=========================================
  Hits            547      547           
  Misses          495      495           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@mollux mollux force-pushed the speedup-compatibility-4.4-part2 branch from 303602b to e395177 Compare August 1, 2023 13:03
@mollux mollux force-pushed the speedup-compatibility-4.4-part2 branch from e395177 to cad7ed4 Compare August 1, 2023 13:10
@escopecz
Copy link
Member

escopecz commented Aug 2, 2023

I've run the M4.4.10 release on this branch and it ended up with several failures:

https://github.com/mautic/api-library/actions/runs/5736933636/job/15547552524

@RCheesley
Copy link
Member

@mollux are you able to take a look at this so we can make the 4.4.10 release?

@mollux mollux force-pushed the speedup-compatibility-4.4-part2 branch 2 times, most recently from 0c126a2 to 3074e1e Compare August 21, 2023 05:48
@mollux mollux force-pushed the speedup-compatibility-4.4-part2 branch from 3074e1e to bb0e107 Compare August 21, 2023 05:57
@mollux mollux force-pushed the speedup-compatibility-4.4-part2 branch from 90745b1 to 9a45170 Compare August 21, 2023 06:56
@mollux
Copy link
Contributor Author

mollux commented Aug 21, 2023

@escopecz

I found a solution to run the tests both on M4 and M5:

changes since last time are:

  • awareness of the mautic version and some small test data changes
  • removal of paratest to prevent a race condition in M4.
    This results in 30 - 50 seconds more test time, but that's still a huge difference compared to before this PR

The last change should also solve the random test failure on the daily tests, as it's the same race condition

@mollux mollux requested a review from escopecz August 21, 2023 07:06
Copy link
Member

@fedys fedys left a comment

Choose a reason for hiding this comment

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

Thanks @mollux! 👍

@mollux mollux merged commit b3258bc into main Aug 22, 2023
@escopecz escopecz deleted the speedup-compatibility-4.4-part2 branch August 28, 2023 07:44
@escopecz
Copy link
Member

Amazing work. Thanks Mattias!

@RCheesley RCheesley added this to the 4.0 milestone Jul 18, 2024
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.

5 participants