Skip to content

Commit 604c8e7

Browse files
Merge pull request #1027 from redhat-developer/upgrade-github-action-versions
gh version updated
2 parents e5a67a1 + 297a32b commit 604c8e7

File tree

4 files changed

+427
-412
lines changed

4 files changed

+427
-412
lines changed

.github/workflows/CI.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
# Steps represent a sequence of tasks that will be executed as part of the job
2424
steps:
2525
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
26-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v4
2727

2828
# Set up Node
29-
- name: Use Node 14
30-
uses: actions/setup-node@v1
29+
- name: Use Node 20
30+
uses: actions/setup-node@v4
3131
with:
32-
node-version: 14
32+
node-version: 20
3333

3434
# Run install dependencies
3535
- name: Install dependencies
@@ -41,13 +41,13 @@ jobs:
4141

4242
# Run tests
4343
- name: Run Test
44-
uses: GabrielBB/xvfb-action@fe2609f8182a9ed5aee7d53ff3ed04098a904df2 #v1.0
44+
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 #v1.0.1
4545
with:
4646
run: yarn test
4747

4848
# Run UI tests
4949
- name: Run UI Test
50-
uses: GabrielBB/xvfb-action@86d97bde4a65fe9b290c0b3fb92c2c4ed0e5302d #v1.6
50+
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 #v1.0.1
5151
with:
5252
run: yarn run ui-test
5353
options: -screen 0 1920x1080x24
@@ -62,15 +62,15 @@ jobs:
6262
#Upload vsix
6363
- name: Upload linux-built vsix
6464
if: matrix.os == 'ubuntu-latest'
65-
uses: actions/upload-artifact@v2
65+
uses: actions/upload-artifact@v4
6666
with:
6767
name: vscode-yaml
6868
path: vscode-yaml*.vsix
6969

7070
# Archive test results
7171
- name: Archiving test artifacts
72-
uses: actions/upload-artifact@v2
73-
with:
72+
uses: actions/upload-artifact@v4
73+
with:
7474
name: ${{ matrix.os }}-artifacts
7575
path: |
7676
test-resources/screenshots/*.png

package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
"format": "prettier --write .",
249249
"lint": "eslint -c .eslintrc.js --ext .ts src test",
250250
"test": "yarn test-compile && sh scripts/e2e.sh",
251-
"ui-test": "yarn test-compile && extest setup-and-run -y out/test/ui-test/allTestsSuite.js -c max",
251+
"ui-test": "yarn test-compile && extest setup-and-run -y out/test/ui-test/allTestsSuite.js -c 1.76.2",
252252
"vscode:prepublish": "webpack --mode production",
253253
"watch": "webpack --mode development --watch --info-verbosity verbose",
254254
"test-compile": "yarn clean && tsc -p ./ && webpack --mode development",
@@ -263,13 +263,14 @@
263263
"@types/sinon-chai": "^3.2.5",
264264
"@types/vscode": "^1.63.0",
265265
"@types/webpack": "^4.4.10",
266-
"@typescript-eslint/eslint-plugin": "^4.16.1",
267-
"@typescript-eslint/parser": "^4.16.1",
266+
"@typescript-eslint/eslint-plugin": "^7.11.0",
267+
"@typescript-eslint/parser": "^7.11.0",
268+
"@vscode/test-electron": "^2.4.0",
268269
"@vscode/test-web": "0.0.11",
269270
"buffer": "^6.0.3",
270271
"chai": "^4.2.0",
271272
"crypto-browserify": "^3.12.0",
272-
"eslint": "^7.6.0",
273+
"eslint": "^8.57.0",
273274
"eslint-config-prettier": "^6.11.0",
274275
"eslint-plugin-prettier": "^3.1.4",
275276
"glob": "^7.1.6",
@@ -282,12 +283,11 @@
282283
"sinon-chai": "^3.7.0",
283284
"ts-loader": "^9.2.5",
284285
"ts-node": "^3.3.0",
285-
"typescript": "4.4.3",
286+
"typescript": "^5.4.5",
286287
"umd-compat-loader": "^2.1.2",
287288
"url": "^0.11.0",
288289
"util": "^0.12.5",
289290
"vscode-extension-tester": "^5.3.0",
290-
"vscode-test": "^1.4.0",
291291
"webpack": "^5.76.1",
292292
"webpack-cli": "^5.0.1"
293293
},
@@ -301,4 +301,4 @@
301301
"whatwg-fetch": "^3.6.2",
302302
"yaml-language-server": "next"
303303
}
304-
}
304+
}

test/testRunner.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* ------------------------------------------------------------------------------------------ */
55
import * as path from 'path';
66
import * as cp from 'child_process';
7-
import { runTests, downloadAndUnzipVSCode, resolveCliPathFromVSCodeExecutablePath } from 'vscode-test';
7+
import { runTests, downloadAndUnzipVSCode, resolveCliPathFromVSCodeExecutablePath } from '@vscode/test-electron';
88

99
async function main(): Promise<void> {
1010
try {

0 commit comments

Comments
 (0)