Merge main into feature/cumulusCiVersion

.github/workflows/beta.yml

@@ -9,6 +9,6 @@ jobs:
    uses: "SFDO-Community/standard-workflows/.github/workflows/beta-2gp.yml@main"
    secrets:
     dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
-   with:
-    cumulusci-version: '3.93.0'
-    sfdx-version: '7.209.6'
+  #  with:
+  #   cumulusci-version: '3.93.0'
+  #   sfdx-version: '7.209.6'

.github/workflows/feature.yml

@@ -1,16 +1,11 @@
 name: "Feature Test"
 on:
-  push:
-    branches:
-      - feature/**
-
+  pull_request:
+  workflow_dispatch:
 
 jobs:
- feature-test:
-   name: "Feature Test"
-   uses: "SFDO-Community/standard-workflows/.github/workflows/feature.yml@main"
-   secrets:
-    dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
-   with:
-    cumulusci-version: '3.93.0'
-    sfdx-version: '7.209.6'
+  feature-test:
+    name: "Feature Test"
+    uses: "SFDO-Community/standard-workflows/.github/workflows/feature.yml@main"
+    secrets:
+      dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"

.github/workflows/prod.yml

@@ -1,11 +1,11 @@
 on:
-  workflow_dispatch: 
+  workflow_dispatch:
 jobs:
   upload-production-release-2gp:
     name: "Upload Production Release (2GP)"
     uses: SFDO-Community/standard-workflows/.github/workflows/production-2gp.yml@main
-    with:
-      cumulusci-version: '3.93.0'
-      sfdx-version: '7.209.6'
+    # with:
+    #   cumulusci-version: '3.93.0'
+    #   sfdx-version: '7.209.6'
     secrets:
       dev-hub-auth-url: '${{ secrets.PACKAGING_ORG_AUTH_URL }}'

CODEOWNERS

@@ -1,2 +1,14 @@
-# Comment line immediately above ownership line is reserved for related other information. Please be careful while editing.
+# Python
+*.py                  @SFDO-Community/sfdo-release-engineers
+
+# CumulusCI
+/cumulusci.yml        @SFDO-Community/sfdo-release-engineers
+/tasks/               @SFDO-Community/sfdo-release-engineers
+
+# Actions
+/.github                @SFDO-Community/sfdo-release-engineers
+/scripts                @SFDO-Community/sfdo-release-engineers
+
+
 #ECCN:Open Source
+#GUSINFO:Open Source,Open Source Workflow

force-app/main/default/classes/UUIDBatchJob.cls

@@ -109,12 +109,12 @@ public with sharing class UUIDBatchJob implements Database.Batchable<SObject> {
       }
     );
 
-    Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();
-    mail.setToAddresses(new List<String>{ job.CreatedBy.Email });
-    mail.setSubject('UUID Batch Job Complete');
-    mail.setPlainTextBody(emailBody);
-
     try {
+      Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();
+      mail.setToAddresses(new List<String>{ job.CreatedBy.Email });
+      mail.setSubject('UUID Batch Job Complete');
+      mail.setPlainTextBody(emailBody);
+
       Messaging.sendEmail(new List<Messaging.SingleEmailMessage>{ mail });
     } catch (Exception e) {
       System.debug(

force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailFolder xmlns="http://soap.sforce.com/2006/04/metadata">
+    <accessType>Public</accessType>
+    <name>UnsubscribeLink</name>
+    <publicFolderAccess>ReadOnly</publicFolderAccess>
+</EmailFolder>

force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email → force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email

@@ -1,5 +1,5 @@
 <messaging:emailTemplate subject="Edit this subject" recipientType="Contact" >
-  <messaging:htmlEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody.
+  <messaging:htmlEmailBody > <!--  When creating a new visualforce template, the default option is plainTextEmailBody.
   the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
   adding the visualforce component -->
 <P>Dear Friend,</P>

force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml → force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email-meta.xml

@@ -2,9 +2,9 @@
 <EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>64.0</apiVersion>
     <available>true</available>
-    <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object.</description>
+    <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object. </description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Contact Template </name>
+    <name>Unsubscribe Sample Contact Template</name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>

force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml → force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email-meta.xml

@@ -2,7 +2,7 @@
 <EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>64.0</apiVersion>
     <available>true</available>
-    <description>Sample template for lead that demonstrates how to use the unsubscribe link visualforce object.</description>
+    <description>Sample template for lead that demonstrates how to use the unsubscribe link visualforce object. </description>
     <encodingKey>UTF-8</encodingKey>
     <name>Unsubscribe Sample Lead Template</name>
     <style>none</style>

force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email → force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email

@@ -1,5 +1,5 @@
 <messaging:emailTemplate subject="Edit this subject" recipientType="Lead" >
-  <messaging:plainTextEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody.
+  <messaging:plainTextEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody. 
   the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
   adding the visualforce component -->
 Dear Friend,

force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml → force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email-meta.xml

@@ -2,7 +2,7 @@
 <EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>64.0</apiVersion>
     <available>true</available>
-    <description>Sample template for lead that demonstrates how to use the unsubscribe link field in a plain text Visualforce email.</description>
+    <description>Sample template for lead that demonstrates how to use the unsubscribe link field in a plain text Visualforce email </description>
     <encodingKey>UTF-8</encodingKey>
     <name>Unsubscribe Sample Lead Template-Plain Text</name>
     <style>none</style>