diff --git a/.git2gus/config.json b/.git2gus/config.json index c97a23cd1..d0c1db50c 100644 --- a/.git2gus/config.json +++ b/.git2gus/config.json @@ -1,6 +1,6 @@ { "productTag": "a1aB0000000c7jnIAA", - "defaultBuild": "[SFCA] Scanner 4.0", + "defaultBuild": "[SFCA] Code Analyzer 5.x", "hideWorkItemUrl": "true", "issueTypeLabels": { "type:feature": "USER STORY", @@ -21,4 +21,4 @@ }, "gusTitlePrefix": "[GitHub Issue]", "statusWhenClosed": "FIXED" -} +} \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/0-code_analyzer_bug.yml b/.github/ISSUE_TEMPLATE/0-code_analyzer_bug.yml index a6f2dd024..1484511bc 100644 --- a/.github/ISSUE_TEMPLATE/0-code_analyzer_bug.yml +++ b/.github/ISSUE_TEMPLATE/0-code_analyzer_bug.yml @@ -27,7 +27,8 @@ body: label: Output / Logs description: Attach any output or logs here. placeholder: | - Add log output or drag files here. + Add log output here. This will be automatically formatted into code, so no need for backticks. + render: shell - type: textarea attributes: label: Steps To Reproduce diff --git a/.github/ISSUE_TEMPLATE/1-scanner_bug.yml b/.github/ISSUE_TEMPLATE/1-scanner_bug.yml deleted file mode 100644 index be5a6b937..000000000 --- a/.github/ISSUE_TEMPLATE/1-scanner_bug.yml +++ /dev/null @@ -1,113 +0,0 @@ -name: Report a Bug with the "scanner" (v4) CLI Commands -description: Report an issue with one of the commands contained in the "@salesforce/sfdx-scanner" Salesforce CLI plugin. -title: "[BUG][scanner] " -body: - - type: checkboxes - attributes: - label: Have you tried to resolve this issue yourself first? - description: | - You can often resolve `scanner` issues on your own. Follow these steps: - 1. Read the error message. - 2. Read the [Salesforce Code Analyzer v4](https://developer.salesforce.com/docs/platform/salesforce-code-analyzer/guide/code-analyzer-3x.html) documentation. - 3. Double-check the command that you ran. Make sure that items like file names, method names, and category names are correctly spelled and cased. - 4. Verify that your code is syntactically valid. - 5. Verify that the error is reproducible on another computer. - 6. Check open and closed [issues](https://github.com/forcedotcom/code-analyzer/issues) to see if your issue is already logged. - options: - - label: I confirm I have gone through the above steps and still have an issue to report. - required: true - - type: textarea - attributes: - label: Bug Description - description: Provide a clear and concise overview of the bug. - validations: - required: true - - type: textarea - attributes: - label: Output / Logs - description: Attach any output or logs here. - placeholder: | - Add log output or drag files here. - - type: textarea - attributes: - label: Steps To Reproduce - description: List the steps that you used to reproduce the bug behavior. Be as specific and clear as possible. If possible, ensure the steps are reproducible on another machine and attach any files that demonstrate the issue. - placeholder: | - 1. I first do ... - 2. Then I do ... - 3. Lastly, I do ... - validations: - required: true - - type: textarea - attributes: - label: Expected Behavior - description: Provide a clear and concise description of what you expected to happen. - validations: - required: true - - type: input - attributes: - label: Operating System - description: | - What is your computer's operating system? - placeholder: | - Example: macOS Sonoma 14.4.1 - validations: - required: true - - type: input - attributes: - label: Salesforce CLI Version - description: | - What do you get when you run the "sf --version" command? - placeholder: | - Example: @salesforce/cli/2.90.4 darwin-x64 node-v22.15.0 - validations: - required: true - - type: input - attributes: - label: Scanner Plugin Version - description: | - What do you get when you run the "sf plugins" command? - placeholder: | - Example: @salesforce/sfdx-scanner 4.12.0 (4.12.0) - validations: - required: true - - type: input - attributes: - label: Node Version - description: | - What do you get when you run the "node --version" command? - placeholder: | - Example: v23.4.0 - validations: - required: false - - type: input - attributes: - label: Java Version - description: | - What do you get when you run the "java -version" command? - placeholder: | - Example: openjdk version "11.0.17.0.1" 2022-10-18 LTS - validations: - required: false - - type: textarea - attributes: - label: Additional Context (Screenshots, Files, etc) - description: Add any other context about the problem. - placeholder: | - Drag any files or screenshots you have here. - - type: textarea - attributes: - label: Workaround - description: What ways have you found to sidestep the problem? If you haven't found a workaround, what have you tried so far? - - type: dropdown - attributes: - label: Urgency - description: What is the severity of the problem? - options: - - Low - - Moderate - - High - - Critical - default: 0 - validations: - required: true diff --git a/.github/ISSUE_TEMPLATE/2-vscode_extension_bug.yml b/.github/ISSUE_TEMPLATE/2-vscode_extension_bug.yml index 04b6bfcbe..50f6311b0 100644 --- a/.github/ISSUE_TEMPLATE/2-vscode_extension_bug.yml +++ b/.github/ISSUE_TEMPLATE/2-vscode_extension_bug.yml @@ -28,7 +28,8 @@ body: label: Output / Logs description: Attach any output or logs here. placeholder: | - Add log output or drag files here. + Add log output here. This will be automatically formatted into code, so no need for backticks. + render: shell - type: textarea attributes: label: Steps To Reproduce @@ -65,22 +66,20 @@ body: required: true - type: input attributes: - label: Salesforce CLI Version + label: Extension Version description: | - What do you get when you run the "sf --version" command in the terminal? + What version do you see for the Salesforce Code Analyzer VS Code Extension? placeholder: | - Example: @salesforce/cli/2.90.4 darwin-x64 node-v22.15.0 + Example: Version: 1.9.0 validations: required: true - - type: dropdown + - type: input attributes: - label: Using v4 - description: "Are you using Code Analyzer v4? (Is the setting 'Code Analyzer: Use v4 (Deprecated)' checked?)" - options: - - "" - - "No" - - "Yes" - - "Not sure" + label: Salesforce CLI Version + description: | + What do you get when you run the "sf --version" command in the terminal? + placeholder: | + Example: @salesforce/cli/2.90.4 darwin-x64 node-v22.15.0 validations: required: true - type: input @@ -89,7 +88,7 @@ body: description: | What do you get when you run the "sf plugins" command in the terminal? placeholder: | - code-analyzer 5.0.0; or if using v4: @salesforce/sfdx-scanner 4.12.0 + code-analyzer 5.0.0 validations: required: false - type: input diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index 75eea34ec..5c390ba1d 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -4,14 +4,6 @@ on: types: [edited, opened, reopened, synchronize] jobs: - # Prevent merging to dev-4 or main-4 to preserve until we're ready to delete - verify_target_branch: - runs-on: ubuntu-latest - steps: - - if: ${{ github.base_ref == 'dev-4' || github.base_ref == 'main-4' }} - run: | - echo "Forbidden to merge this branch into dev-4 or main-4" - exit 1 # We need to verify that the Pull Request's title matches the desired format. verify_pr_title: runs-on: ubuntu-latest