Skip to content

Commit

Permalink
Merge branch 'develop' into cristi/soql-toggle
Browse files Browse the repository at this point in the history
  • Loading branch information
@CristiCanizales
CristiCanizales authored Sep 26, 2024
2 parents 212908d + fc67a49 commit 3590a3e
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 12 deletions.
28 changes: 22 additions & 6 deletions .github/workflows/coreE2E.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,16 @@ jobs:
testToRun: 'sfdxProjectJson.e2e.ts'
vscodeVersion: ${{ inputs.vscodeVersion }}
runId: ${{ inputs.runId }}

createProjectTest:
if: ${{ inputs.miscellaneous }}
uses: ./.github/workflows/runE2ETest.yml
secrets: inherit
with:
automationBranch: ${{ inputs.automationBranch }}
testToRun: 'createProjectTest.e2e.ts'
vscodeVersion: ${{ inputs.vscodeVersion }}
runId: ${{ inputs.runId }}

slack_success_notification:
if: ${{ success() }}
Expand All @@ -164,15 +174,17 @@ jobs:
authentication,
miscellaneous,
sObjectsDefinitions,
templates
templates,
sfdxProjectJson,
createProjectTest
]
uses: ./.github/workflows/slackNotification.yml
secrets: inherit
with:
title: 'Core E2E Tests'
vscodeVersion: ${{ inputs.vscodeVersion }}
testsBranch: ${{ inputs.automationBranch }}
summary: '\n- An Initial Suite: ${{ needs.anInitialSuite.result }}\n- Authentication: ${{ needs.authentication.result }}\n- Miscellaneous: ${{ needs.miscellaneous.result }}\n- SObjects Definitions: ${{ needs.sObjectsDefinitions.result }}\n- Templates: ${{ needs.templates.result }}'
summary: '\n- An Initial Suite: ${{ needs.anInitialSuite.result }}\n- Authentication: ${{ needs.authentication.result }}\n- Miscellaneous: ${{ needs.miscellaneous.result }}\n- SObjects Definitions: ${{ needs.sObjectsDefinitions.result }}\n- Templates: ${{ needs.templates.result }}\n- SFDX Project Json: ${{ needs.sfdxProjectJson.result}}\n- Create Project Test: ${{needs.createProjectTest.result}}'
result: 'All the tests passed.'
workflow: 'actions/runs/${{ github.run_id }}'
type: 'e2e'
Expand All @@ -185,15 +197,17 @@ jobs:
authentication,
miscellaneous,
sObjectsDefinitions,
templates
templates,
sfdxProjectJson,
createProjectTest
]
uses: ./.github/workflows/slackNotification.yml
secrets: inherit
with:
title: 'Core E2E Tests'
vscodeVersion: ${{ inputs.vscodeVersion }}
testsBranch: ${{ inputs.automationBranch }}
summary: '\n- An Initial Suite: ${{ needs.anInitialSuite.result }}\n- Authentication: ${{ needs.authentication.result }}\n- Miscellaneous: ${{ needs.miscellaneous.result }}\n- SObjects Definitions: ${{ needs.sObjectsDefinitions.result }}\n- Templates: ${{ needs.templates.result }}'
summary: '\n- An Initial Suite: ${{ needs.anInitialSuite.result }}\n- Authentication: ${{ needs.authentication.result }}\n- Miscellaneous: ${{ needs.miscellaneous.result }}\n- SObjects Definitions: ${{ needs.sObjectsDefinitions.result }}\n- Templates: ${{ needs.templates.result }}\n- SFDX Project Json: ${{ needs.sfdxProjectJson.result}}\n- Create Project Test: ${{needs.createProjectTest.result}}'
result: 'Not all the tests passed.'
workflow: 'actions/runs/${{ github.run_id }}'
type: 'e2e'
Expand All @@ -206,15 +220,17 @@ jobs:
authentication,
miscellaneous,
sObjectsDefinitions,
templates
templates,
sfdxProjectJson,
createProjectTest
]
uses: ./.github/workflows/slackNotification.yml
secrets: inherit
with:
title: 'Core E2E Tests'
vscodeVersion: ${{ inputs.vscodeVersion }}
testsBranch: ${{ inputs.automationBranch }}
summary: '\n- An Initial Suite: ${{ needs.anInitialSuite.result }}\n- Authentication: ${{ needs.authentication.result }}\n- Miscellaneous: ${{ needs.miscellaneous.result }}\n- SObjects Definitions: ${{ needs.sObjectsDefinitions.result }}\n- Templates: ${{ needs.templates.result }}'
summary: '\n- An Initial Suite: ${{ needs.anInitialSuite.result }}\n- Authentication: ${{ needs.authentication.result }}\n- Miscellaneous: ${{ needs.miscellaneous.result }}\n- SObjects Definitions: ${{ needs.sObjectsDefinitions.result }}\n- Templates: ${{ needs.templates.result }}\n- Templates: ${{ needs.templates.result }}\n- SFDX Project Json: ${{ needs.sfdxProjectJson.result}}\n- Create Project Test: ${{needs.createProjectTest.result}}'
result: 'The workflow was cancelled.'
workflow: 'actions/runs/${{ github.run_id }}'
type: 'e2e'
35 changes: 29 additions & 6 deletions .github/workflows/deployRetrieveE2E.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ on:
required: false
default: true
type: boolean
mdDeployRetrieve:
description: 'Metadata Deploy and Retrieve'
required: false
default: true
type: boolean
vscodeVersion:
description: 'VSCode Version'
required: false
Expand Down Expand Up @@ -75,6 +80,11 @@ on:
required: false
default: true
type: boolean
mdDeployRetrieve:
description: 'Metadata Deploy and Retrieve'
required: false
default: true
type: boolean
vscodeVersion:
description: 'VSCode Version'
required: false
Expand Down Expand Up @@ -135,6 +145,16 @@ jobs:
testToRun: 'pushAndPull.e2e.ts'
vscodeVersion: ${{ inputs.vscodeVersion }}
runId: ${{ inputs.runId }}

mdDeployRetrieve:
if: ${{ inputs.mdDeployRetrieve }}
uses: ./.github/workflows/runE2ETest.yml
secrets: inherit
with:
automationBranch: ${{ inputs.automationBranch }}
testToRun: 'metadataDeployRetrieve.e2e.ts'
vscodeVersion: ${{ inputs.vscodeVersion }}
runId: ${{ inputs.runId }}

slack_success_notification:
if: ${{ success() }}
Expand All @@ -143,7 +163,8 @@ jobs:
# diffAndConflictDetection,
manifestBuilder,
orgBrowser,
pushAndPull
pushAndPull,
mdDeployRetrieve
]
uses: ./.github/workflows/slackNotification.yml
secrets: inherit
Expand All @@ -152,7 +173,7 @@ jobs:
vscodeVersion: ${{ inputs.vscodeVersion }}
testsBranch: ${{ inputs.automationBranch }}
# summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Diff and Conflict Detection: ${{ needs.diffAndConflictDetection.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}'
summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}'
summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}\n- MD Deploy and Retrieve: ${{needs.mdDeployRetrieve.result}} '
result: 'All the tests passed.'
workflow: 'actions/runs/${{ github.run_id }}'
type: 'e2e'
Expand All @@ -164,7 +185,8 @@ jobs:
# diffAndConflictDetection,
manifestBuilder,
orgBrowser,
pushAndPull
pushAndPull,
mdDeployRetrieve
]
uses: ./.github/workflows/slackNotification.yml
secrets: inherit
Expand All @@ -173,7 +195,7 @@ jobs:
vscodeVersion: ${{ inputs.vscodeVersion }}
testsBranch: ${{ inputs.automationBranch }}
# summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Diff and Conflict Detection: ${{ needs.diffAndConflictDetection.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}'
summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}'
summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}\n- MD Deploy and Retrieve: ${{needs.mdDeployRetrieve.result}} '
result: 'Not all the tests passed.'
workflow: 'actions/runs/${{ github.run_id }}'
type: 'e2e'
Expand All @@ -185,7 +207,8 @@ jobs:
# diffAndConflictDetection,
manifestBuilder,
orgBrowser,
pushAndPull
pushAndPull,
mdDeployRetrieve
]
uses: ./.github/workflows/slackNotification.yml
secrets: inherit
Expand All @@ -194,7 +217,7 @@ jobs:
vscodeVersion: ${{ inputs.vscodeVersion }}
testsBranch: ${{ inputs.automationBranch }}
# summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Diff and Conflict Detection: ${{ needs.diffAndConflictDetection.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}'
summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}'
summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}\n- MD Deploy and Retrieve: ${{needs.mdDeployRetrieve.result}} '
result: 'The workflow was cancelled.'
workflow: 'actions/runs/${{ github.run_id }}'
type: 'e2e'

0 comments on commit 3590a3e

Please sign in to comment.