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

Backport 20230824 #20207

Merged
merged 123 commits into from
Aug 31, 2023
Merged

Backport 20230824 #20207

merged 123 commits into from
Aug 31, 2023

Conversation

tseho
Copy link
Contributor

@tseho tseho commented Aug 25, 2023 •
edited

Description (for Contributor and Core Developer)

The most important part of the PR is the script: backport.sh.

Doing like we do for pull up cannot be done between repositories, we cannot "merge".
Instead, what is does is the following:

  • It lookup the last backport using the commit id versioned in last_backport.txt.
  • It searches for all commits between the last backport and pim-enterprise-dev:master that are modifying CE files.
  • Each commit is then cherry-picked and edited to only backport changes to the whitelist of directories, protecting us from backporting EE features.
  • Finally, the latest commit from pim-enterprise-dev:master is commited in last_backport.txt so the next backport can start from where we stopped.

⚠️ When backporting changes, the CI will probably often fail (like it does for the current PR) because some changes needs to be fixed manually (example: we don't backport bundles.php automatically, new bundles need to be added manually).

⚠️ The EE and CE upgrades/ directories were merged together, EE migrations are backported by default, I removed them in a follow-up commit.

Definition Of Done (for Core Developer only)

  • Tests
  • Migration & Installer
  • PM Validation (Story)
  • Changelog (maintenance bug fixes)
  • Tech Doc

@tseho tseho requested review from a team as code owners August 25, 2023 09:32
@github-actions
Copy link
Contributor

A new version of the staging env has been deployed 🎉
Check it out here: https://akeneo.github.io/akeneo-design-system/20207/

@github-actions
Copy link
Contributor

A new version of the staging env has been deployed 🎉
Check it out here: https://akeneo.github.io/akeneo-design-system/20207/

@github-actions
Copy link
Contributor

A new version of the staging env has been deployed 🎉
Check it out here: https://akeneo.github.io/akeneo-design-system/20207/

@github-actions
Copy link
Contributor

A new version of the staging env has been deployed 🎉
Check it out here: https://akeneo.github.io/akeneo-design-system/20207/

2 similar comments
@github-actions
Copy link
Contributor

A new version of the staging env has been deployed 🎉
Check it out here: https://akeneo.github.io/akeneo-design-system/20207/

@github-actions
Copy link
Contributor

A new version of the staging env has been deployed 🎉
Check it out here: https://akeneo.github.io/akeneo-design-system/20207/

@github-actions
Copy link
Contributor

A new version of the staging env has been deployed 🎉
Check it out here: https://akeneo.github.io/akeneo-design-system/20207/

@github-actions
Copy link
Contributor

A new version of the staging env has been deployed 🎉
Check it out here: https://akeneo.github.io/akeneo-design-system/20207/

pierallard and others added 22 commits August 30, 2023 12:35
@pierallard @tseho
Merge pull request #18739 from akeneo/PIM-11155
78138ff
@BryanS29-akeneo @tseho
GRF-706: Asynchronous deletion of category images (#18596)
3945f3b
@BenjaminRbt @tseho
CXP-1485: Data transformation foundations (#18374)
7537b24
@nelson-akeneo @tseho
Merge pull request #18758 from nelson-akeneo/crowdin/master-2023-08-2…
e90d478 
…9-19-04
@marinfazioakeneo @tseho
RAB-1496: Add controller to fetch family templates (#18715)
980513a
@LevFlavien @tseho
AST-702: Ability to add custom headers to MessengerBundle's messages
6e6851f
@LevFlavien @tseho
AST-702: Update MessengerBundle's JsonSerializer test
db52d19
@LevFlavien @tseho
AST-702: Document MessengerBundle's new ability to handle custom Stamps
1b3d359
@LevFlavien @tseho
AST-702: Validate that the same stamp can't be used twice
69d0cda
@LevFlavien @tseho
AST-702: Move CustomerHeaderStamp to Component directory
3a7a851
@tseho
Merge pull request #18763 from akeneo/fix-enrichment-mk-tests
2fbe39c
@tseho
Merge pull request #18764 from akeneo/fix-dqi-path
c38d302
@tseho
Updates last commit backported
a711c61
@tseho
compat: Removes ZDD migration for assets
9a122e6
@tseho
compat: Updates path to fixtures
bb7aa63
@tseho
compat: Removes invalid feature flags
042b7a6
@tseho
compat: Register new microfrontend for Structure UI
b2ca2d5
@tseho
Removes EE steps from the CE CI
478f346
@tseho
compat: Removes EE migrations
0289ace
@tseho
compat: disable typechecking on tests
e4660b8
@tseho
compat: Missing service in integration tests
d8f8a7c
@tseho
compat: Adds missing category command bus
04521bf
@github-actions
Copy link
Contributor

A new version of the staging env has been deployed 🎉
Check it out here: https://akeneo.github.io/akeneo-design-system/20207/

@github-actions
Copy link
Contributor

A new version of the staging env has been deployed 🎉
Check it out here: https://akeneo.github.io/akeneo-design-system/20207/

@tseho tseho merged commit 7a8c885 into master Aug 31, 2023
11 of 14 checks passed
@tseho tseho deleted the backport-20230824 branch August 31, 2023 09:27
@LaurentPetard LaurentPetard mentioned this pull request Aug 31, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliensnz juliensnz juliensnz approved these changes

Assignees
No one assigned
Labels
echoes/intent: feature 50% echoes/intent: maintenance 20% echoes/intent: technical 30%
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet