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

[Release] Stage to Main #2203

Merged
merged 4 commits into from
Apr 25, 2024
Merged

[Release] Stage to Main #2203

merged 4 commits into from
Apr 25, 2024

Conversation

Ruchika4
Copy link
Contributor

@Ruchika4 Ruchika4 commented Apr 24, 2024 •
edited
Loading

@meganthecoder @robert-bogos @elan-tbx
MWPW-144549 CTA alignment for Text, Icon, and Media Blocks (#2098)
95d6ad6 
* MWPW-144549 CTA alignment for Text, Icon, and Media Blocks

* redo in flex

* tests and renaming

* icon cleanup

* test cleanup

* lint cleanup

* cr rename ctas

* supplemental text and consistent variable names

* qa - fix icon block mobile padding

* qa - exclude qr code

* icon bio cta

---------

Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
Co-authored-by: Elan Bartholomew <79870969+elan-tbx@users.noreply.github.com>
@Ruchika4 Ruchika4 added high-impact Any PR that may affect consumers run-nala Run Nala Test Automation against PR needs-verification PR requires E2E testing by a reviewer Ready for Main This PR is ready almost ready to be merged into main. Please inform all T1 QAs labels Apr 24, 2024
@Ruchika4 Ruchika4 requested review from a team April 24, 2024 21:29
@aem-code-sync AEM Code Sync
Copy link
Contributor

aem-code-sync bot commented Apr 24, 2024 •
edited
Loading

Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch and validate page speed.
In case there are problems, just click a checkbox below to rerun the respective action.

  • Re-run PSI checks
  • Re-sync branch
Commits

@codecov Codecov
Copy link

codecov bot commented Apr 24, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.65%. Comparing base (5291cb1) to head (1332031).

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2203      +/-   ##
==========================================
+ Coverage   96.64%   96.65%   +0.01%     
==========================================
  Files         165      165              
  Lines       43523    43525       +2     
==========================================
+ Hits        42062    42069       +7     
+ Misses       1461     1456       -5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@github-actions GitHub Actions
Copy link
Contributor

This pull request is not passing all required checks. Please see this discussion for information on how to get all checks passing. Inconsistent checks can be manually retried. If a test absolutely can not pass for a good reason, please add a comment with an explanation to the PR.

@robert-bogos
MWPW-146999: kodiak CVE 25883 (#2183)
8c8834f 
* updated eslint-plugin-compat

* added TODOs

* hotfix
@JackySun9
Copy link
Contributor

Screenshot 2024-04-25 at 9 21 42 AM Screenshot 2024-04-25 at 9 21 33 AM I saw a difference from UAR side on main cc live, do you know why?

@meganthecoder
Copy link
Contributor

meganthecoder commented Apr 25, 2024 •
edited
Loading

I saw a difference from UAR side on main cc live, do you know why?

@JackySun9 What's the url?

@JackySun9
Copy link
Contributor

https://main--cc--adobecom.hlx.live/creativecloud/plan-recommender/quiz-results?quizkey=cc-quiz&milolibs=stage

@meganthecoder
Copy link
Contributor

@JackySun9 I can replicate the issue. Thanks for catching this.

@Ruchika4 It's likely caused by #2098 so as per the rules, it should be pulled out, right?

@Ruchika4
Copy link
Contributor Author

@JackySun9 I can replicate the issue. Thanks for catching this.

@Ruchika4 It's likely caused by #2098 so as per the rules, it should be pulled out, right?

Yes, creating a revert PR

@Ruchika4 Ruchika4 mentioned this pull request Apr 25, 2024
Merged
@Ruchika4 Ruchika4 added the do not merge PR should not be merged yet label Apr 25, 2024
@Ruchika4
Revert "MWPW-144549 CTA alignment for Text, Icon, and Media Blocks" (#…
1332031 
…2207)

Revert "MWPW-144549 CTA alignment for Text, Icon, and Media Blocks (#2098)"

This reverts commit 95d6ad6.
@Ruchika4 Ruchika4 removed do not merge PR should not be merged yet high-impact Any PR that may affect consumers labels Apr 25, 2024
@Ruchika4 Ruchika4 added verified PR has been E2E tested by a reviewer and removed needs-verification PR requires E2E testing by a reviewer labels Apr 25, 2024
@Ruchika4 Ruchika4 merged commit 88a24e8 into main Apr 25, 2024
19 of 21 checks passed
@meganthecoder meganthecoder mentioned this pull request Apr 25, 2024
Merged
@github-actions github-actions bot mentioned this pull request Apr 30, 2024
Closed
@mokimo mokimo mentioned this pull request May 7, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sigadamvenkata sigadamvenkata sigadamvenkata approved these changes

@Roycethan Roycethan Roycethan approved these changes

@JackySun9 JackySun9 JackySun9 approved these changes

@TsayAdobe TsayAdobe TsayAdobe approved these changes

@Dli3 Dli3 Dli3 approved these changes

@meganthecoder meganthecoder meganthecoder approved these changes

@ryanmparrish ryanmparrish Awaiting requested review from ryanmparrish

@elan-tbx elan-tbx Awaiting requested review from elan-tbx

@overmyheadandbody overmyheadandbody Awaiting requested review from overmyheadandbody

@mokimo mokimo Awaiting requested review from mokimo

@narcis-radu narcis-radu Awaiting requested review from narcis-radu

@Blainegunn Blainegunn Awaiting requested review from Blainegunn

Assignees
No one assigned
Labels
BAcom SOT 👌 CC SOT 👌 Homepage SOT 👌 MIQ SOT👌 Ready for Main This PR is ready almost ready to be merged into main. Please inform all T1 QAs run-nala Run Nala Test Automation against PR verified PR has been E2E tested by a reviewer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@Ruchika4 @JackySun9 @meganthecoder @Dli3 @TsayAdobe @Roycethan @sigadamvenkata @tedAir @robert-bogos