Skip to content

Commit 45a3e82

Browse files
authored
More CI fixes (#158)
- Bring back retries for E2E tests - Bump versions
1 parent f0189ee commit 45a3e82

File tree

8 files changed

+351
-307
lines changed

8 files changed

+351
-307
lines changed

.github/workflows/tests.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,15 @@ jobs:
116116
working-directory: packages/databricks-vscode
117117

118118
- name: Integration Tests
119-
run: |
120-
yarn workspace databricks-vscode run test:integ:clean
121-
yarn install --immutable
122-
yarn build
123-
cd packages/databricks-vscode
124-
yarn run test:integ
119+
uses: nick-fields/retry@v2
120+
with:
121+
max_attempts: 3
122+
retry_wait_seconds: 2
123+
timeout_minutes: 10
124+
retry_on: any
125+
command: |
126+
cd packages/databricks-vscode
127+
yarn run test:integ
125128
126129
- name: Upload test logs
127130
if: always()

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
"homepage": "https://github.com/databricks/databricks-vscode#readme",
3131
"packageManager": "yarn@3.2.1",
3232
"devDependencies": {
33-
"@typescript-eslint/eslint-plugin": "^5.37.0",
34-
"@typescript-eslint/parser": "^5.37.0",
35-
"eslint": "^8.23.1",
33+
"@typescript-eslint/eslint-plugin": "^5.42.0",
34+
"@typescript-eslint/parser": "^5.42.0",
35+
"eslint": "^8.26.0",
3636
"eslint-config-prettier": "^8.5.0",
3737
"ts-mockito": "^2.6.1",
38-
"typescript": "^4.8.3"
38+
"typescript": "^4.8.4"
3939
}
4040
}

packages/databricks-sdk-js/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,23 @@
4040
"@types/chai-as-promised": "^7.1.5",
4141
"@types/chai-spies": "^1.0.3",
4242
"@types/ini": "^1.3.31",
43-
"@types/mocha": "^9.1.1",
44-
"@types/node": "^18.8.2",
43+
"@types/mocha": "^10.0.0",
44+
"@types/node": "^18.11.9",
4545
"@types/tmp": "^0.2.3",
4646
"@types/uuid": "^8.3.4",
4747
"chai": "^4.3.6",
4848
"chai-as-promised": "^7.1.1",
4949
"chai-spies": "^1.0.0",
50-
"eslint": "^8.23.1",
51-
"mocha": "^10.0.0",
50+
"eslint": "^8.26.0",
51+
"mocha": "^10.1.0",
5252
"nyc": "^15.1.0",
5353
"prettier": "^2.7.1",
5454
"tmp-promise": "^3.0.3",
55-
"ts-loader": "^9.3.1",
55+
"ts-loader": "^9.4.1",
5656
"ts-mocha": "^10.0.0",
5757
"ts-mockito": "^2.6.1",
5858
"ts-node": "^10.9.1",
59-
"typescript": "^4.8.3",
59+
"typescript": "^4.8.4",
6060
"uuid": "^9.0.0"
6161
},
6262
"nyc": {
@@ -78,4 +78,4 @@
7878
],
7979
"report-dir": "coverage"
8080
}
81-
}
81+
}

packages/databricks-vscode-types/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"watch": "tsc -w"
1919
},
2020
"devDependencies": {
21-
"@types/vscode": "^1.69.1",
22-
"typescript": "^4.8.3"
21+
"@types/vscode": "^1.73.0",
22+
"typescript": "^4.8.4"
2323
},
2424
"dependencies": {
2525
"@databricks/databricks-sdk": "workspace:^"

packages/databricks-vscode/package.json

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,6 @@
502502
"fix": "prettier . --write",
503503
"test:lint": "eslint src --ext ts && prettier . -c",
504504
"test:unit": "yarn run build && node ./out/test/runTest.js",
505-
"test:integ:clean": "yarn run clean && rm -rf /tmp/vscode-test-databricks /tmp/databricks-vscode-test-extensions",
506505
"test:integ:prepare": "CODE_VERSION=1.69.1 && yarn run package && ts-node src/test/vscode-extension-tester-patch/cli.ts get-vscode --code_version $CODE_VERSION --storage /tmp/vscode-test-databricks && ts-node src/test/vscode-extension-tester-patch/cli.ts get-chromedriver --code_version $CODE_VERSION --storage /tmp/vscode-test-databricks",
507506
"test:integ:install-vsix": "ts-node src/test/vscode-extension-tester-patch/cli.ts install-vsix --storage /tmp/vscode-test-databricks -f databricks-vscode*.vsix -e /tmp/databricks-vscode-test-extensions",
508507
"test:integ:run": "yarn run build && node out/test/e2e/scripts/e2e.js -e /tmp/databricks-vscode-test-extensions --storage /tmp/vscode-test-databricks --code_settings src/test/e2e/settings.json 'out/**/*.e2e.js'",
@@ -514,34 +513,34 @@
514513
"dependencies": {
515514
"@databricks/databricks-sdk": "*",
516515
"@databricks/databricks-vscode-types": "workspace:^",
517-
"@vscode/debugadapter": "^1.57.0",
518-
"@vscode/webview-ui-toolkit": "^1.0.1"
516+
"@vscode/debugadapter": "^1.58.0",
517+
"@vscode/webview-ui-toolkit": "^1.1.0"
519518
},
520519
"devDependencies": {
521520
"@istanbuljs/nyc-config-typescript": "^1.0.2",
522521
"@types/fs-extra": "^9.0.13",
523522
"@types/glob": "^8.0.0",
524-
"@types/mocha": "^9.1.1",
525-
"@types/node": "^18.7.17",
523+
"@types/mocha": "^10.0.0",
524+
"@types/node": "^18.11.9",
526525
"@types/tmp": "^0.2.3",
527-
"@types/vscode": "^1.69.0",
528-
"@typescript-eslint/eslint-plugin": "^5.37.0",
529-
"@typescript-eslint/parser": "^5.37.0",
530-
"@vscode/test-electron": "^2.1.5",
531-
"esbuild": "^0.15.7",
532-
"eslint": "^8.23.1",
526+
"@types/vscode": "^1.69.1",
527+
"@typescript-eslint/eslint-plugin": "^5.42.0",
528+
"@typescript-eslint/parser": "^5.42.0",
529+
"@vscode/test-electron": "^2.2.0",
530+
"esbuild": "^0.15.13",
531+
"eslint": "^8.26.0",
533532
"fs-extra": "^10.1.0",
534533
"glob": "^8.0.3",
535-
"mocha": "^10.0.0",
534+
"mocha": "^10.1.0",
536535
"mock-require": "^3.0.3",
537536
"nyc": "^15.1.0",
538537
"prettier": "^2.7.1",
539538
"tmp-promise": "^3.0.3",
540539
"ts-mockito": "^2.6.1",
541540
"ts-node": "^10.9.1",
542-
"typescript": "^4.8.3",
543-
"vsce": "^2.11.0",
544-
"vscode-extension-tester": "^4.4.1",
541+
"typescript": "^4.8.4",
542+
"vsce": "^2.13.0",
543+
"vscode-extension-tester": "5.1.x",
545544
"winston": "^3.8.2"
546545
},
547546
"nyc": {

packages/databricks-vscode/src/test/e2e/configure.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe("Configure Databricks Extension", async function () {
2727
let clusterId: string;
2828
let periodicRunners = new Map<string, PeriodicRunner>();
2929

30-
this.timeout(10 * 60 * 1000);
30+
this.timeout(3 * 60 * 1000);
3131

3232
before(async function () {
3333
browser = VSBrowser.instance;

packages/databricks-vscode/src/test/vscode-extension-tester-patch/download.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ function isGotResponseOk(response: Response) {
3030

3131
const options: OptionsOfTextResponseBody & {isStream?: undefined} = {
3232
headers: {
33+
// eslint-disable-next-line @typescript-eslint/naming-convention
3334
"user-agent": "nodejs",
3435
},
3536
agent: {

0 commit comments

Comments
 (0)