Merge branch 'develop' into deploy-on-save-panel

forcedotcom · Oct 22, 2024 · 660aad9 · 660aad9
2 parents 3b421e0 + cf3f6c7
commit 660aad9
Show file tree

Hide file tree

Showing 30 changed files with 201 additions and 171 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -30,23 +30,13 @@ on:
         required: false
         default: true
         type: boolean
-      lspE2ETests:
-        description: 'LSP E2E Tests'
-        required: false
-        default: true
-        type: boolean
       lwcE2ETests:
         description: 'LWC E2E Tests'
         required: false
         default: true
         type: boolean
-      soqlE2ETests:
-        description: 'SOQL E2E Tests'
-        required: false
-        default: true
-        type: boolean
       vscodeVersion:
-        description: 'VSCode Version for ESM branches'
+        description: 'VSCode Version'
         required: false
         default: '1.92.2'
         type: string
@@ -83,15 +73,6 @@ jobs:
       vscodeVersion: ${{ inputs.vscodeVersion || '1.92.2' }}
       runId: ${{ inputs.runId || github.event.workflow_run.id }}
 
-  LSP_E2E_tests:
-    if: ${{ inputs.lspE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
-    uses: ./.github/workflows/lspE2E.yml
-    secrets: inherit
-    with:
-      automationBranch: ${{ inputs.automationBranch || 'main' }}
-      vscodeVersion: ${{ inputs.vscodeVersion || '1.92.2' }}
-      runId: ${{ inputs.runId || github.event.workflow_run.id }}
-
   LWC_E2E_tests:
     if: ${{ inputs.lwcE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
     uses: ./.github/workflows/lwcE2E.yml
@@ -101,15 +82,6 @@ jobs:
       vscodeVersion: ${{ inputs.vscodeVersion || '1.92.2' }}
       runId: ${{ inputs.runId || github.event.workflow_run.id }}
 
-  SOQL_E2E_tests:
-    if: ${{ inputs.soqlE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
-    uses: ./.github/workflows/soqlE2E.yml
-    secrets: inherit
-    with:
-      automationBranch: ${{ inputs.automationBranch || 'main' }}
-      vscodeVersion: ${{ inputs.vscodeVersion || '1.92.2' }}
-      runId: ${{ inputs.runId || github.event.workflow_run.id }}
-
   Apex_E2E_tests_min_vscode_version:
     if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/apexE2E.yml
@@ -137,15 +109,6 @@ jobs:
       vscodeVersion: '1.86.0'
       runId: ${{ github.event.workflow_run.id }}
 
-  LSP_E2E_tests_min_vscode_version:
-    if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
-    uses: ./.github/workflows/lspE2E.yml
-    secrets: inherit
-    with:
-      automationBranch: 'main'
-      vscodeVersion: '1.86.0'
-      runId: ${{ github.event.workflow_run.id }}
-
   LWC_E2E_tests_min_vscode_version:
     if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/lwcE2E.yml
@@ -154,12 +117,3 @@ jobs:
       automationBranch: 'main'
       vscodeVersion: '1.86.0'
       runId: ${{ github.event.workflow_run.id }}
-
-  SOQL_E2E_tests_min_vscode_version:
-    if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
-    uses: ./.github/workflows/soqlE2E.yml
-    secrets: inherit
-    with:
-      automationBranch: 'main'
-      vscodeVersion: '1.86.0'
-      runId: ${{ github.event.workflow_run.id }}
diff --git a/.github/workflows/e2eRedHat.yml b/.github/workflows/e2eRedHat.yml
@@ -25,6 +25,16 @@ on:
         required: false
         default: true
         type: boolean
+      lspE2ETests:
+        description: 'LSP E2E Tests'
+        required: false
+        default: true
+        type: boolean
+      soqlE2ETests:
+        description: 'SOQL E2E Tests'
+        required: false
+        default: true
+        type: boolean
       vscodeVersion:
         description: 'VSCode Version for ESM branches'
         required: false
@@ -36,7 +46,7 @@ on:
         type: string
 
 jobs:
-  Apex_E2E_tests_Redhat:
+  Apex:
     if: ${{ inputs.apexE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
     uses: ./.github/workflows/apexE2EredHat.yml
     secrets: inherit
@@ -45,7 +55,7 @@ jobs:
       vscodeVersion: ${{ inputs.vscodeVersion || 'stable' }}
       runId: ${{ inputs.runId || github.event.workflow_run.id }}
 
-  Core_E2E_tests_RedHat:
+  Core:
     if: ${{ inputs.coreE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
     uses: ./.github/workflows/coreE2EredHat.yml
     secrets: inherit
@@ -54,7 +64,25 @@ jobs:
       vscodeVersion: ${{ inputs.vscodeVersion || 'stable' }}
       runId: ${{ inputs.runId || github.event.workflow_run.id }}
 
-  Apex_E2E_tests_Redhat_min_vscode_version:
+  LSP:
+    if: ${{ inputs.lspE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
+    uses: ./.github/workflows/lspE2E.yml
+    secrets: inherit
+    with:
+      automationBranch: ${{ inputs.automationBranch || 'main' }}
+      vscodeVersion: ${{ inputs.vscodeVersion || 'stable' }}
+      runId: ${{ inputs.runId || github.event.workflow_run.id }}
+
+  SOQL:
+    if: ${{ inputs.soqlE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
+    uses: ./.github/workflows/soqlE2E.yml
+    secrets: inherit
+    with:
+      automationBranch: ${{ inputs.automationBranch || 'main' }}
+      vscodeVersion: ${{ inputs.vscodeVersion || 'stable' }}
+      runId: ${{ inputs.runId || github.event.workflow_run.id }}
+
+  Apex_min_vscode_version:
     if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/apexE2EredHat.yml
     secrets: inherit
@@ -63,11 +91,29 @@ jobs:
       vscodeVersion: '1.86.0'
       runId: ${{ github.event.workflow_run.id }}
 
-  Core_E2E_tests_RedHat_min_vscode_version:
+  Core_min_vscode_version:
     if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/coreE2EredHat.yml
     secrets: inherit
     with:
       automationBranch: 'main'
       vscodeVersion: '1.86.0'
       runId: ${{ github.event.workflow_run.id }}
+
+  LSP_min_vscode_version:
+    if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
+    uses: ./.github/workflows/lspE2E.yml
+    secrets: inherit
+    with:
+      automationBranch: 'main'
+      vscodeVersion: '1.86.0'
+      runId: ${{ github.event.workflow_run.id }}
+
+  SOQL_min_vscode_version:
+    if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
+    uses: ./.github/workflows/soqlE2E.yml
+    secrets: inherit
+    with:
+      automationBranch: 'main'
+      vscodeVersion: '1.86.0'
+      runId: ${{ github.event.workflow_run.id }}
diff --git a/.github/workflows/lspE2E.yml b/.github/workflows/lspE2E.yml
@@ -26,7 +26,7 @@ on:
       vscodeVersion:
         description: 'VSCode Version'
         required: false
-        default: '1.92.2'
+        default: 'stable'
         type: string
       runId:
         description: 'Run ID of the workflow run that created the vsixes'
@@ -58,7 +58,7 @@ on:
       vscodeVersion:
         description: 'VSCode Version'
         required: false
-        default: '1.92.2'
+        default: 'stable'
         type: string
       runId:
         description: 'Run ID of the workflow run that created the vsixes'
@@ -72,7 +72,8 @@ jobs:
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch }}
-      testToRun: 'auraLsp.e2e.ts'
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'auraLsp.e2e.js'
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
 
@@ -82,7 +83,8 @@ jobs:
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch }}
-      testToRun: 'lwcLsp.e2e.ts'
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'lwcLsp.e2e.js'
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
 
@@ -92,7 +94,8 @@ jobs:
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch }}
-      testToRun: 'visualforceLsp.e2e.ts'
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'visualforceLsp.e2e.js'
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
       os: '["macos-latest", "ubuntu-latest"]'

diff --git a/.github/workflows/runE2ETest.yml b/.github/workflows/runE2ETest.yml
@@ -102,6 +102,17 @@ jobs:
       - name: Set THROTTLE_FACTOR for Windows
         if: matrix.os == 'windows-latest'
         run: echo "THROTTLE_FACTOR=5" >> $GITHUB_ENV
+      - name: Run test setup script
+        if: inputs.automationRepo == 'salesforcedx-vscode-automation-tests'
+        uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3
+        with:
+          run: |
+            npm run setup
+          working-directory: 'salesforcedx-vscode-automation-tests'
+        env:
+          VSCODE_VERSION: ${{ matrix.vscodeVersion }}
+          SFDX_AUTH_URL: ${{ secrets.SFDX_AUTH_URL_E2E }}
+          ORG_ID: ${{ secrets.ORG_ID_E2E }}
       - name: Run headless test
         uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3
         with:

diff --git a/.github/workflows/soqlE2E.yml b/.github/workflows/soqlE2E.yml
@@ -16,7 +16,7 @@ on:
       vscodeVersion:
         description: 'VSCode Version'
         required: false
-        default: '1.92.2'
+        default: 'stable'
         type: string
       runId:
         description: 'Run ID of the workflow run that created the vsixes'
@@ -38,7 +38,7 @@ on:
       vscodeVersion:
         description: 'VSCode Version'
         required: false
-        default: '1.92.2'
+        default: 'stable'
         type: string
       runId:
         description: 'Run ID of the workflow run that created the vsixes'
@@ -52,7 +52,8 @@ jobs:
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch }}
-      testToRun: 'soql.e2e.ts'
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'soql.e2e.js'
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
 

diff --git a/.gitignore b/.gitignore
@@ -118,3 +118,6 @@ packages/dbaeumer*
 # Extension build directory
 packages/**/extension
 tsconfig.tsbuildinfo
+
+#Extensions folder for local E2E Testing
+extensions/
diff --git a/SHA256.md b/SHA256.md
@@ -8,24 +8,24 @@ make sure that their SHA values match the values in the list below.
    following the instructions at
    https://code.visualstudio.com/docs/editor/extension-gallery#_common-questions.
    For example, download,
-   https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/62.0.0/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
+   https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/62.2.0/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
 
 2. From a terminal, run:
 
 shasum -a 256 <location_of_the_downloaded_file>
 
 3. Confirm that the SHA in your output matches the value in this list of SHAs.
 
-0e49a8250b43a87dd705e8e3dd60df0f52177fb88fcbe6040c7257634f68becd  salesforcedx-vscode-62.0.0.vsix
-ae5cf35b1002570edbc5b8f6203900a8a2203d30619428b30c1ba5dd3696897e  salesforcedx-vscode-apex-62.0.0.vsix
-347de41b9a78d36a60ac2a95e786bafdfa0ba38a518963e52a547672a5e902cc  salesforcedx-vscode-apex-debugger-62.0.0.vsix
-7b53c08f9526bee6702f2fabbd3317814e6467a804de24a06d120478c5571389  salesforcedx-vscode-apex-replay-debugger-62.0.0.vsix
-7915f24b7f966a6db368b0e3d81e4e9aeeea368b9b75bfc267743a537a9d0cdf  salesforcedx-vscode-core-62.0.0.vsix
-29fd6de93ff074530b7e6bd803fd40571dd2cfbfe240acf98d4df6f260859e7c  salesforcedx-vscode-expanded-62.0.0.vsix
-b542ce8a4725580f24cc94d438044aa6783439ec05ba0ac9bcc77d48e5d8b13a  salesforcedx-vscode-lightning-62.0.0.vsix
-4f72abd94610e5501eb3bc1b6a949d422d5b3b298610f7f2f678f993faf948bf  salesforcedx-vscode-lwc-62.0.0.vsix
-835086e2a383b6df9e47276c2cc7e0b52b1d41621efc2aae755ad9c693b392b3  salesforcedx-vscode-soql-62.0.0.vsix
-1b3b14d99267113b6ac9bf5da06addb2158b0939add5260974b3449a2d1ee861  salesforcedx-vscode-visualforce-62.0.0.vsix
+7a580e87e995f8d9b760131a78661d7b5b55649d8a81c2491bc4840bbf93ec37  salesforcedx-vscode-62.2.0.vsix
+f749d777d2f25f4f30eabbd6cb33bb6ab0a268b44838244a859f4b82df6c22c6  salesforcedx-vscode-apex-62.2.0.vsix
+9d77ac90aff8ab01a5fc8962233fd9f38772640728fc9866d37e9682d13d1264  salesforcedx-vscode-apex-debugger-62.2.0.vsix
+be88f7d711919cd0bc8fb5426df29c0dd3c3a6b9e52eccfb674f6b69b3b5b7b2  salesforcedx-vscode-apex-replay-debugger-62.2.0.vsix
+bc978617001bf50a8a1ab68878233b4e41d0e51790133833f585f954f98877a8  salesforcedx-vscode-core-62.2.0.vsix
+5ce5ae34051171c091be4826754e268bf52c9dfb47379b575a39a5cb1ee40634  salesforcedx-vscode-expanded-62.2.0.vsix
+5c8249ff626457ea054f68bf1afeb68d219bdc34dca7bedaa77b4422cbedaa98  salesforcedx-vscode-lightning-62.2.0.vsix
+e0f4ce4310dbea11afa8e84c8efb52a51e373db27e59c9aa4b5a714bc4ca3a3c  salesforcedx-vscode-lwc-62.2.0.vsix
+6369c517721380d98876badd0e18847959edb20232996bf5ed77481ec6fc5fa4  salesforcedx-vscode-soql-62.2.0.vsix
+1cd95bf8fb0aba7309cb4c22f295ed107eff6896e0b9e5850f856a28d9f2c539  salesforcedx-vscode-visualforce-62.2.0.vsix
 
 
 4. Change the filename extension for the file that you downloaded from .zip to

diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "62.1.0",
+  "version": "62.2.0",
   "command": {
     "version": {
       "allowBranch": [