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

Rename 8.1.6.sql to 8.1.7.sql #701

Merged
merged 1 commit into from
May 22, 2024
Merged

Rename 8.1.6.sql to 8.1.7.sql #701

merged 1 commit into from
May 22, 2024

Conversation

matks
Copy link
Contributor

@matks matks commented May 17, 2024

Questions Answers
Description? See below
Type? improvement
BC breaks? no
Deprecations? no
Fixed ticket?
Sponsor company
How to test? This is a simple file renaming allowing changes scheduled for 8.1.6 release to be done for upgrade from (...) to 8.1.7 instead. You can verify that by performing an upgrade from (example) 8.1.5 to 8.1.7 and verifying one of the SQL scripts written here has been performed, while an upgrade (example) from 8.1.5 to 8.1.6 did not trigger these scripts.

Description

PrestaShop 8.1.6 was a security release, so we did not bundle all the PRs merged for 8.1.6 in it. Instead, we simply created 8.1.6 by fetching the 8.1.5 tag and then adding the content of the security patch on top of it.

The PRs merged for 8.1.6 on branch 8.1.x have been milestoned 8.1.7 instead and will be delivered with patch release 8.1.7 . Consequently it is necessary to rename file 8.1.6.sql to 8.1.7.sql

Copy link
Contributor

@Hlavtox Hlavtox left a comment

Choose a reason for hiding this comment

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

@matks Can I merge it or I would get banned?

@matks
Copy link
Contributor Author

matks commented May 19, 2024

@matks Can I merge it or I would get banned?

CI is red

@Hlavtox
Copy link
Contributor

Hlavtox commented May 19, 2024

@matks True, and we should also ask QA before

@Quetzacoalt91
Copy link
Member

@matks Can you please rebase?

@matks
Copy link
Contributor Author

matks commented May 21, 2024

@Quetzacoalt91 Done ;)

AureRita
AureRita previously approved these changes May 21, 2024
Copy link
Contributor

@AureRita AureRita left a comment

Choose a reason for hiding this comment

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

Hi @matks

Thank you for your PR, I tested it and it seems to works as you can see :

recording.211.webm

Tested from 8.1.5 to 8.1.6 only (because I already check it on other PR)

Because the PR seems to works as expected, It's QA ✔️

Thank you

Copy link
Contributor

@Hlavtox Hlavtox left a comment

Choose a reason for hiding this comment

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

@AureRita Can you please verify the QA process again?

On your video, you still have 8.1.5 after the upgrade.
Also, you just showed us that your database has changed, but it SHOULD NOT change.

Copy link
Contributor

@AureRita AureRita left a comment

Choose a reason for hiding this comment

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

Hi @Hlavtox

Indeed It was a strange version 8.1.6 that I have ( when I load it to a new shop, it write 8.1.5 ... )
But, I do the test again and as you can see :

recording.213.webm

With a do an upgrade from a minor version to go on 8.1.6, I don't have the changes ✔️

When I specified that's a 8.1.7, I have the changes ✔️

So it's QA ✔️

@Quetzacoalt91 Quetzacoalt91 added this to the 5.0.2 milestone May 21, 2024
@nicosomb nicosomb requested a review from Hlavtox May 22, 2024 06:31
@Hlavtox Hlavtox merged commit 4c5adb4 into PrestaShop:dev May 22, 2024
29 checks passed
@matks matks deleted the 6-to-7 branch May 22, 2024 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

8 participants