Merge branch 'master' into feature/enhanced_profiles

Signed-off-by: worksofliam <[email protected]>
codefori · Jan 10, 2025 · 6e3137b · 6e3137b
2 parents 0300298 + ae2c38f
commit 6e3137b
Show file tree

Hide file tree

Showing 60 changed files with 5,218 additions and 7,626 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -4,7 +4,6 @@ jobs:
   release:
     name: Validation
     runs-on: ubuntu-latest
-    if: contains(github.event.pull_request.labels.*.name, 'build')
     steps:
       - name: Use Node.js 20
         uses: actions/setup-node@v3
@@ -15,8 +14,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
-      - run: npm install
-      - run: npm run lint
+      - run: npm ci
+
+      - name: Build types
+        run: npm run typings
 
       - run: npm install -g @vscode/vsce
       - name: Create build
@@ -27,17 +28,35 @@ jobs:
         with:
           name: code-for-ibmi-pr-build
           path: ./*.vsix
-
+
+      - name: Find Comment
+        uses: peter-evans/find-comment@v1
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: new build is available
+
       - name: Post comment
+        if: steps.fc.outputs.comment-id == ''
         uses: actions/github-script@v5
         with:
           script: |
             github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: '👋  A new build is available for this PR based on ${{ github.event.pull_request.head.sha }}.\n * [Download here.](https://github.com/codefori/vscode-ibmi/actions/runs/${{ github.run_id }})\n* [Read more about how to test](https://github.com/codefori/vscode-ibmi/blob/master/.github/pr_testing_template.md)'
+              body: '👋 A new build is available for this PR based on ${{ github.event.pull_request.head.sha }}.\n * [Download here.](https://github.com/codefori/vscode-ibmi/actions/runs/${{ github.run_id }})\n* [Read more about how to test](https://github.com/codefori/vscode-ibmi/blob/master/.github/pr_testing_template.md)'
             })
 
-      - name: Build types
-        run: npm run typings
+      - name: Update comment
+        if: steps.fc.outputs.comment-id != ''
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          edit-mode: replace
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          body: |
+            👋 A new build is available for this PR based on ${{ github.event.pull_request.head.sha }}.
+
+            * [Download here.](https://github.com/codefori/vscode-ibmi/actions/runs/${{ github.run_id }})
+            * [Read more about how to test](https://github.com/codefori/vscode-ibmi/blob/master/.github/pr_testing_template.md)
diff --git a/.github/workflows/prerelease.yaml b/.github/workflows/prerelease.yaml
@@ -13,10 +13,10 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          ref: master
+          ref: ${{ github.ref }}
 
       - name: Install dependencies
-        run: npm install
+        run: npm ci
 
       - name: Update version number for prelease
         run: |

diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+registry = "https://registry.npmjs.org/"
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -31,7 +31,41 @@
 			"sourceMaps": true,
 			"preLaunchTask": "${defaultBuildTask}",
 			"env": {
-				"testing": "true"
+				"base_testing": "true"
+			}
+		},
+		{
+			"name": "Extension Tests (All simultaneously)",
+			"type": "extensionHost",
+			"request": "launch",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}"
+			],
+			"outFiles": [
+				"${workspaceFolder}/dist/**/*.js"
+			],			
+			"sourceMaps": true,
+			"preLaunchTask": "${defaultBuildTask}",
+			"env": {
+				"base_testing": "true",
+				"simultaneous": "true"
+			}
+		},
+		{
+			"name": "Extension Tests (Encoding suite)",
+			"type": "extensionHost",
+			"request": "launch",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}"
+			],
+			"outFiles": [
+				"${workspaceFolder}/dist/**/*.js"
+			],			
+			"sourceMaps": true,
+			"preLaunchTask": "${defaultBuildTask}",
+			"env": {
+				"base_testing": "true",
+				"specific": "encoding"
 			}
 		},
 		{
@@ -47,7 +81,7 @@
 			"sourceMaps": true,
 			"preLaunchTask": "${defaultBuildTask}",
 			"env": {
-				"testing": "true",
+				"base_testing": "true",
 				"individual": "true"
 			}
 		},