Skip to content

Merge main into feature/cumulusCiVersion - #200

Open
github-actions[bot] wants to merge 61 commits into
feature/cumulusCiVersionfrom
main
Open

github-actions[bot] wants to merge 61 commits into
feature/cumulusCiVersionfrom
main

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

This pull request was automatically generated because an automated merge hit a merge conflict

salgsstyrke and others added 23 commits August 29, 2025 12:48
Move 3 vf template emails to their own folder because of a conflict in unfiled public.
All of my changes related to the emails were breaking it so now attempting to undo those changes.
Updates feature test workflow to trigger on pull requests instead of
only feature/** branch pushes. This enables CI to run on PRs from any
branch and from forks after maintainer approval.
Description to use: Adding ECCN information per Salesforce OSPO request

Signed-off-by: Cori O'Brien <37851761+coriobriensfdo@users.noreply.github.com>
Co-authored-by: James Estevez <j@jstvz.dev>
Move try statement to before single email message creation.
## Summary
- Fix YAML indentation in feature workflow that caused SFDX auth URL parsing errors

## Details
Corrected indentation for the `feature-test` job and `secrets` section. The malformed YAML was causing the dev-hub-auth-url secret to be incorrectly parsed, resulting in "Invalid SFDX authorization URL" errors during workflow execution.

## Test Plan
- [ ] Verify workflow runs successfully with proper SFDX auth URL format
Adds improvements to setup flow that were initially part of PR #189
Restore sample email templates to public folder.
@github-actions
github-actions Bot requested a review from a team as a code owner February 11, 2026 16:52
DKeatonDC and others added 5 commits August 6, 2026 14:33
Restores named folder to allow package to build.

Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Used to restore the unfiled templates.  In this unlovely scenario, we have identical templates in unfiled and in the named folder, but this may be necessary to build.

Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
…ribeSetup

Limits Creation of Unsubscribe Record to 1
jstvz and others added 2 commits August 13, 2026 17:19
The two HTML sample templates cannot deploy as unmanaged metadata via
unpackaged/post. They reference the packaged Visualforce component across
a namespace boundary, and the component attribute recipientId is not
access="global". The platform rejects the cross-namespace call:

  Cannot use attribute recipientid without global access in a
  component/page that is not in the same namespace as the component

Remove:
- Unsubscribe_Contact_Template_HTML.email (+ meta)
- Unsubscribe_Lead_Template_HTML.email (+ meta)

Keep the plain-text sample. Add the CumulusCI namespace token so the
merge field resolves in both managed and unmanaged contexts:

  {!Recipient.%%%NAMESPACE%%%Unsubscribe_Url_Plain_Text__c}

With this change the install path deploys clean. HTML sample delivery is
left as a product decision (see follow-up on #217).
…lates

Drop HTML sample email templates from unpackaged/post
Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Removes creator's email from default in a variable and improves error handling.

Signed-off-by: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
…d varaible in an attempt to trigger an error)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants