Cherry pick main back to development #2535

jhanca-robotecai · 2023-12-22T13:23:45Z

Change summary

This PR cherry-picks changes that were pushed to the main branch (directly or via stabilization branches) and that were not pushed to the development branch causing the misalignment.

In December I synchronized the branches by doing the following cherry-picks:
aaa7c60
f5dad19
133b8f2
d9d3a03
b816fd7
05fa6a3
da33e38
b7fe90c
14dea04

Unfortunately, the code was not reviewed and not merged. Today (July 4) I picked up the task again and created a supportive branch on which I created the linear history for cherry-picking for all commits that entered main branch after the synchronization that took place earlier. The branch is pushed to this repo for the reviewer's convenience: jhanca-robotecai/main_linear23101 . Note, that there is no difference between the HEAD of jhanca-robotecai/main_linear23101 and the HEAD of main. Thanks to the linear history, I was able to cherry-pick the code on top of this branch. I.e. I was able to cherry-pick all commits from the main branch between b7fe90c and 31622c5

Testing

I pushed one more branch for the reviewer's convenience: jhanca-robotecai/main_development. I cherry-picked to this branch all commits that entered the development branch after the last main updates. When comparing jhanca-robotecai/main_development with jhanca-robotecai/merge_main there are several differences, caused by the fact that was merged into development and never made into main:

This proves I did not miss any changes in main branch.

Concerns

I am aware it is impossible to review this PR due to the size of the change. This is caused by the cherry-pick of #2475 which is equally big. I did not change those files myself, but AFAIK those are autogenerated files that should be updated again. I might revert those changes to make this PR easier to review. Just let me know. Otherwise, feel free to push the code to my branch or open PR to my branch. Thanks for help!

jhanca-robotecai · 2024-02-14T15:55:05Z

I might add my signature to the cherry-picked commits if this is required by the procedure (DCO), but I thought it would be okay to keep it as is. Please let me know.

ShaunaGordon · 2024-07-03T19:22:06Z

Note, for reference purposes

Jan is picking this back up and updating it to include merges since this PR was submitted. I'll then be reviewing and testing it so we can get it merged asap.

Signed-off-by: chanmosq <75444793+chanmosq@users.noreply.github.com>

* Add the offline installer instructions for Windows Signed-off-by: Mike Chang <changml@amazon.com>

Update system requirements link and clarify snap instructions Signed-off-by: Mike Chang <changml@amazon.com>

* Update code-of-conduct.md Removed mentions of CNCF Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com> * Update code-of-conduct.md Removed now extraneous line regarding other languages. Signed-off-by: Roddie Kieley <rkieley@redhat.com> --------- Signed-off-by: Naomi Washington <70667788+Naomi-Wash@users.noreply.github.com> Signed-off-by: Roddie Kieley <rkieley@redhat.com> Co-authored-by: Roddie Kieley <rkieley@redhat.com>

jhanca-robotecai · 2024-07-04T18:11:09Z

I push-forced the code with the updates, please see the updated description in the first post.

ShaunaGordon · 2024-07-17T21:13:37Z

👍🏼

@RoddieKieley Looks good to me. Just need you to hit the approve button and do the merge.

adamdbrw · 2024-08-13T10:38:18Z

@RoddieKieley could you take a look at this?

jhanca-robotecai · 2024-08-16T08:22:15Z

There was another conflict due to the recent changes to documentation in #2578

Unfortunately, this PR missed the changes from #2519 and #2514 that were pushed directly to the stabilization branch.

I decided to keep only changes from #2578.

Stabilization/2310 Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

Added 23.10 release notes. Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

prefab override clarifications and updates Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

Stabilization/23101 -> main for publishing Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* Updating project export instructions to warn O3DE installer/SDK users. Installed versions of O3DE must use profile configuration and non-monolithic builds in order to package their game Signed-off-by: AMZN-Gene <genewalt@amazon.com> * Minor. Whitespace fix Signed-off-by: AMZN-Gene <genewalt@amazon.com> --------- Signed-off-by: AMZN-Gene <genewalt@amazon.com> Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

…elease (#2519) * initial documentation updates for recent exporter changes for point release Signed-off-by: TJ Kotha <tankotha@amazon.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * addressed feedback Signed-off-by: TJ Kotha <tankotha@amazon.com> * removed unnecessary warning for profile builds Signed-off-by: TJ Kotha <tankotha@amazon.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * Update content/docs/user-guide/packaging/project-export/project-export-cli.md Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> * adding wildcard documentation for seed parameters Signed-off-by: TJ Kotha <tankotha@amazon.com> * splitting argument table into separate unique entries Signed-off-by: TJ Kotha <tankotha@amazon.com> * minor sentence improvement Signed-off-by: TJ Kotha <tankotha@amazon.com> * minor sentence improvements Signed-off-by: TJ Kotha <tankotha@amazon.com> * split up snippets into smaller sections Signed-off-by: TJ Kotha <tankotha@amazon.com> --------- Signed-off-by: TJ Kotha <tankotha@amazon.com> Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> Co-authored-by: TJ Kotha <tankotha@amazon.com> Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> Co-authored-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com>

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

Signed-off-by: kursad-k <67970138+kursad-k@users.noreply.github.com>

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

* adding documentation for the new export button Signed-off-by: TJ Kotha <tankotha@amazon.com> * addressing feedback round 1 Signed-off-by: TJ Kotha <tankotha@amazon.com> * updating screenshots Signed-off-by: TJ Kotha <tankotha@amazon.com> --------- Signed-off-by: TJ Kotha <tankotha@amazon.com> Co-authored-by: TJ Kotha <tankotha@amazon.com> Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

jhanca-robotecai · 2024-08-16T08:53:32Z

I force-pushed the PR again to fix DCO: I signed all commits.

jhanca-robotecai · 2024-08-16T08:56:35Z

@RoddieKieley Looks good to me. Just need you to hit the approve button and do the merge.

@ShaunaGordon could you please give an approve to this PR?

ShaunaGordon · 2024-08-19T15:43:42Z

@jhanca-robotecai Done. Looks good. 👍🏼

jhanca-robotecai requested a review from RoddieKieley December 22, 2023 13:23

jhanca-robotecai requested review from a team as code owners December 22, 2023 13:23

jhanca-robotecai mentioned this pull request Dec 27, 2023

sub-page describing SDFormat sensor importer #2515

Merged

4 tasks

RoddieKieley removed request for a team July 3, 2024 15:53

ShaunaGordon mentioned this pull request Jul 3, 2024

Proposed SIG-Docs meeting agenda for 2024-07-03 o3de/sig-docs-community#122

Closed

7 tasks

chanmosq and others added 4 commits July 4, 2024 12:40

Quick fix - Made documentation be the landing page

57bd053

Signed-off-by: chanmosq <75444793+chanmosq@users.noreply.github.com>

Windows offline installer instructions (#2445)

ea86970

* Add the offline installer instructions for Windows Signed-off-by: Mike Chang <changml@amazon.com>

Update linux and snap package instructions (#2462)

0f29724

Update system requirements link and clarify snap instructions Signed-off-by: Mike Chang <changml@amazon.com>

jhanca-robotecai force-pushed the jhanca-robotecai/merge_main branch from 8d899ef to 751070a Compare July 4, 2024 17:50

RoddieKieley and others added 8 commits August 16, 2024 10:49

Merge pull request #2475 from o3de/stabilization/2310

237838a

Stabilization/2310 Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

Merge pull request #2491 from RoddieKieley/2310-main-release-notes

250602a

Added 23.10 release notes. Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

Merge pull request #2492 from aws-lumberyard-dev/alexmont/main

95175ef

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

Merge pull request #2496 from aws-lumberyard-dev/alexmont/main

79d8f4d

prefab override clarifications and updates Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

Merge pull request #2512 from o3de/stabilization/23101

280a97b

Stabilization/23101 -> main for publishing Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

fix diff between main and development

d390331

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

jhanca-robotecai and others added 7 commits August 16, 2024 10:52

Merge pull request #2513 from RoddieKieley/stabilization/23101

ec2f829

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

Added 23.10.1 release notes.

118efce

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

fix the typo (#2547)

eb0edbf

Signed-off-by: kursad-k <67970138+kursad-k@users.noreply.github.com>

Updated for the 23.10.3 point release.

ccf8b64

Signed-off-by: Roddie Kieley <rkieley@redhat.com>

Merge pull request #2552 from guillaume-haerinck/samples

e96b945

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

fix merge conflicts

0631232

Signed-off-by: Jan Hanca <jan.hanca@robotec.ai>

jhanca-robotecai force-pushed the jhanca-robotecai/merge_main branch from 2141b4f to 83b6eb7 Compare August 16, 2024 08:52

ShaunaGordon approved these changes Aug 19, 2024

View reviewed changes

jhanca-robotecai merged commit 7e16a81 into development Aug 22, 2024
5 checks passed

jhanca-robotecai deleted the jhanca-robotecai/merge_main branch August 22, 2024 14:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cherry pick main back to development #2535

Cherry pick main back to development #2535

jhanca-robotecai commented Dec 22, 2023 •

edited

Loading

jhanca-robotecai commented Feb 14, 2024

ShaunaGordon commented Jul 3, 2024

jhanca-robotecai commented Jul 4, 2024

ShaunaGordon commented Jul 17, 2024

adamdbrw commented Aug 13, 2024

jhanca-robotecai commented Aug 16, 2024 •

edited

Loading

jhanca-robotecai commented Aug 16, 2024 •

edited

Loading

jhanca-robotecai commented Aug 16, 2024 •

edited

Loading

ShaunaGordon commented Aug 19, 2024

Cherry pick main back to development #2535

Cherry pick main back to development #2535

Conversation

jhanca-robotecai commented Dec 22, 2023 • edited Loading

Change summary

Testing

Concerns

jhanca-robotecai commented Feb 14, 2024

ShaunaGordon commented Jul 3, 2024

jhanca-robotecai commented Jul 4, 2024

ShaunaGordon commented Jul 17, 2024

adamdbrw commented Aug 13, 2024

jhanca-robotecai commented Aug 16, 2024 • edited Loading

jhanca-robotecai commented Aug 16, 2024 • edited Loading

jhanca-robotecai commented Aug 16, 2024 • edited Loading

ShaunaGordon commented Aug 19, 2024

jhanca-robotecai commented Dec 22, 2023 •

edited

Loading

jhanca-robotecai commented Aug 16, 2024 •

edited

Loading

jhanca-robotecai commented Aug 16, 2024 •

edited

Loading

jhanca-robotecai commented Aug 16, 2024 •

edited

Loading