Skip to content

Commit

Permalink
Merge pull request #1027 from redhat-developer/upgrade-github-action-…
Browse files Browse the repository at this point in the history
…versions

gh version updated
  • Loading branch information
msivasubramaniaan authored Jun 3, 2024
2 parents e5a67a1 + 297a32b commit 604c8e7
Show file tree
Hide file tree
Showing 4 changed files with 427 additions and 412 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Set up Node
- name: Use Node 14
uses: actions/setup-node@v1
- name: Use Node 20
uses: actions/setup-node@v4
with:
node-version: 14
node-version: 20

# Run install dependencies
- name: Install dependencies
Expand All @@ -41,13 +41,13 @@ jobs:

# Run tests
- name: Run Test
uses: GabrielBB/xvfb-action@fe2609f8182a9ed5aee7d53ff3ed04098a904df2 #v1.0
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 #v1.0.1
with:
run: yarn test

# Run UI tests
- name: Run UI Test
uses: GabrielBB/xvfb-action@86d97bde4a65fe9b290c0b3fb92c2c4ed0e5302d #v1.6
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 #v1.0.1
with:
run: yarn run ui-test
options: -screen 0 1920x1080x24
Expand All @@ -62,15 +62,15 @@ jobs:
#Upload vsix
- name: Upload linux-built vsix
if: matrix.os == 'ubuntu-latest'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: vscode-yaml
path: vscode-yaml*.vsix

# Archive test results
- name: Archiving test artifacts
uses: actions/upload-artifact@v2
with:
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}-artifacts
path: |
test-resources/screenshots/*.png
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
"format": "prettier --write .",
"lint": "eslint -c .eslintrc.js --ext .ts src test",
"test": "yarn test-compile && sh scripts/e2e.sh",
"ui-test": "yarn test-compile && extest setup-and-run -y out/test/ui-test/allTestsSuite.js -c max",
"ui-test": "yarn test-compile && extest setup-and-run -y out/test/ui-test/allTestsSuite.js -c 1.76.2",
"vscode:prepublish": "webpack --mode production",
"watch": "webpack --mode development --watch --info-verbosity verbose",
"test-compile": "yarn clean && tsc -p ./ && webpack --mode development",
Expand All @@ -263,13 +263,14 @@
"@types/sinon-chai": "^3.2.5",
"@types/vscode": "^1.63.0",
"@types/webpack": "^4.4.10",
"@typescript-eslint/eslint-plugin": "^4.16.1",
"@typescript-eslint/parser": "^4.16.1",
"@typescript-eslint/eslint-plugin": "^7.11.0",
"@typescript-eslint/parser": "^7.11.0",
"@vscode/test-electron": "^2.4.0",
"@vscode/test-web": "0.0.11",
"buffer": "^6.0.3",
"chai": "^4.2.0",
"crypto-browserify": "^3.12.0",
"eslint": "^7.6.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.4",
"glob": "^7.1.6",
Expand All @@ -282,12 +283,11 @@
"sinon-chai": "^3.7.0",
"ts-loader": "^9.2.5",
"ts-node": "^3.3.0",
"typescript": "4.4.3",
"typescript": "^5.4.5",
"umd-compat-loader": "^2.1.2",
"url": "^0.11.0",
"util": "^0.12.5",
"vscode-extension-tester": "^5.3.0",
"vscode-test": "^1.4.0",
"webpack": "^5.76.1",
"webpack-cli": "^5.0.1"
},
Expand All @@ -301,4 +301,4 @@
"whatwg-fetch": "^3.6.2",
"yaml-language-server": "next"
}
}
}
2 changes: 1 addition & 1 deletion test/testRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* ------------------------------------------------------------------------------------------ */
import * as path from 'path';
import * as cp from 'child_process';
import { runTests, downloadAndUnzipVSCode, resolveCliPathFromVSCodeExecutablePath } from 'vscode-test';
import { runTests, downloadAndUnzipVSCode, resolveCliPathFromVSCodeExecutablePath } from '@vscode/test-electron';

async function main(): Promise<void> {
try {
Expand Down
Loading

0 comments on commit 604c8e7

Please sign in to comment.