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

Reverting changes made to the Trial config folder #6942

Merged
merged 2 commits into from
Apr 22, 2022

Conversation

lparrott
Copy link
Contributor

@lparrott lparrott commented Apr 21, 2022

  • Note: The change list looks massive, but it's just the config/trial folder from our past release, plus a new config/trial_tso folder of the new changes that were causing deployment issues for some orgs.
    • Reverting changes made to the Trial config folder
    • Moving TSO changes to a separate folder

Fixes #6940

Critical Changes

Changes

Issues Closed

Community Ideas Delivered

Features Intended for Future Release

Features for Elevate Customers

New Metadata

Deleted Metadata

@lparrott lparrott requested a review from force2b April 21, 2022 21:50
@lparrott lparrott requested a review from a team as a code owner April 21, 2022 21:50
@lparrott lparrott requested a review from jstvz April 21, 2022 21:50
@github-actions
Copy link

Hi 👋 @lparrott! Release Engineering asks that teams use the following process for routine reviews:

  1. After creating a non-draft pull request that includes automation updates, a release engineer will be auto-assigned to the PR.
  2. When dev review is complete and the PR is ready for the release engineer to review, add a "ready for RE review" label to the PR to let us know when the PR is ready for us to review.
  3. If you've added the "ready for RE review" label but haven't received a review within a 36 hours, @-mention the assigned RE in a comment on the PR.
  4. If you don't receive a response from the assigned RE by the end of the next business day (or your request is urgent), post a message to #sfdo-releng-support that includes a link to this PR and one of us will review as soon as we're able.

Copy link
Contributor

@davidmreed davidmreed left a comment

Choose a reason for hiding this comment

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

CODEOWNERS approval

@@ -172,16 +172,6 @@
<name>facet-8473c7e1-3bfd-4985-9ea8-8df0fc82ac74</name>
<type>Facet</type>
</flexiPageRegions>
<flexiPageRegions>
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think this change belongs in here, but it's also possible these will flush out once the other PR is merge.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I branched from the other fix branch in case we just wanted to do one merge 🤷

@@ -1,58 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<FlexiPage xmlns="http://soap.sforce.com/2006/04/metadata">
<flexiPageRegions>
<itemInstances>
Copy link

@bdvorachek bdvorachek Apr 21, 2022

Choose a reason for hiding this comment

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

Should these files have been reverted back to .flexipage-meta.xml filetypes? That's what I see in git from before we pulled down the trial org metadata.

Choose a reason for hiding this comment

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

Nevermind, I see that the API Version Update from 48 -> 53 is also included in the revert here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, it's confusing because the file that's on version 53 is now in config/trial_tso, this is just a copy of what was in the old config/trial folder, but it shows up as an update.

@force2b force2b merged commit 94279ba into main Apr 22, 2022
@force2b force2b deleted the feature/999__revertTrialConfigChanges branch April 22, 2022 18:10
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.

NPSP trial metadata no longer deploys to an Enterprise Edition org
4 participants