Skip to content

Commit 2965867

Browse files
committed
Merge branch 'master' into feature/inherit_asp
Signed-off-by: worksofliam <[email protected]>
2 parents 1f62928 + ae2c38f commit 2965867

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+5237
-7648
lines changed

.github/workflows/pr.yaml

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ jobs:
44
release:
55
name: Validation
66
runs-on: ubuntu-latest
7-
if: contains(github.event.pull_request.labels.*.name, 'build')
87
steps:
98
- name: Use Node.js 20
109
uses: actions/setup-node@v3
@@ -15,8 +14,10 @@ jobs:
1514
- uses: actions/checkout@v2
1615
with:
1716
fetch-depth: 1
18-
- run: npm install
19-
- run: npm run lint
17+
- run: npm ci
18+
19+
- name: Build types
20+
run: npm run typings
2021

2122
- run: npm install -g @vscode/vsce
2223
- name: Create build
@@ -27,17 +28,35 @@ jobs:
2728
with:
2829
name: code-for-ibmi-pr-build
2930
path: ./*.vsix
30-
31+
32+
- name: Find Comment
33+
uses: peter-evans/find-comment@v1
34+
id: fc
35+
with:
36+
issue-number: ${{ github.event.pull_request.number }}
37+
comment-author: 'github-actions[bot]'
38+
body-includes: new build is available
39+
3140
- name: Post comment
41+
if: steps.fc.outputs.comment-id == ''
3242
uses: actions/github-script@v5
3343
with:
3444
script: |
3545
github.rest.issues.createComment({
3646
issue_number: context.issue.number,
3747
owner: context.repo.owner,
3848
repo: context.repo.repo,
39-
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)'
49+
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)'
4050
})
4151
42-
- name: Build types
43-
run: npm run typings
52+
- name: Update comment
53+
if: steps.fc.outputs.comment-id != ''
54+
uses: peter-evans/create-or-update-comment@v1
55+
with:
56+
edit-mode: replace
57+
comment-id: ${{ steps.fc.outputs.comment-id }}
58+
body: |
59+
👋 A new build is available for this PR based on ${{ github.event.pull_request.head.sha }}.
60+
61+
* [Download here.](https://github.com/codefori/vscode-ibmi/actions/runs/${{ github.run_id }})
62+
* [Read more about how to test](https://github.com/codefori/vscode-ibmi/blob/master/.github/pr_testing_template.md)

.github/workflows/prerelease.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
- uses: actions/checkout@v3
1515
with:
16-
ref: master
16+
ref: ${{ github.ref }}
1717

1818
- name: Install dependencies
19-
run: npm install
19+
run: npm ci
2020

2121
- name: Update version number for prelease
2222
run: |

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry = "https://registry.npmjs.org/"

.vscode/launch.json

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,41 @@
3131
"sourceMaps": true,
3232
"preLaunchTask": "${defaultBuildTask}",
3333
"env": {
34-
"testing": "true"
34+
"base_testing": "true"
35+
}
36+
},
37+
{
38+
"name": "Extension Tests (All simultaneously)",
39+
"type": "extensionHost",
40+
"request": "launch",
41+
"args": [
42+
"--extensionDevelopmentPath=${workspaceFolder}"
43+
],
44+
"outFiles": [
45+
"${workspaceFolder}/dist/**/*.js"
46+
],
47+
"sourceMaps": true,
48+
"preLaunchTask": "${defaultBuildTask}",
49+
"env": {
50+
"base_testing": "true",
51+
"simultaneous": "true"
52+
}
53+
},
54+
{
55+
"name": "Extension Tests (Encoding suite)",
56+
"type": "extensionHost",
57+
"request": "launch",
58+
"args": [
59+
"--extensionDevelopmentPath=${workspaceFolder}"
60+
],
61+
"outFiles": [
62+
"${workspaceFolder}/dist/**/*.js"
63+
],
64+
"sourceMaps": true,
65+
"preLaunchTask": "${defaultBuildTask}",
66+
"env": {
67+
"base_testing": "true",
68+
"specific": "encoding"
3569
}
3670
},
3771
{
@@ -47,7 +81,7 @@
4781
"sourceMaps": true,
4882
"preLaunchTask": "${defaultBuildTask}",
4983
"env": {
50-
"testing": "true",
84+
"base_testing": "true",
5185
"individual": "true"
5286
}
5387
},

0 commit comments

Comments
 (0)