Skip to content

Commit f54b9e1

Browse files
Merge branch 'replace-odo-delete-component' of https://github.com/msivasubramaniaan/vscode-openshift-tools into replace-odo-delete-component
2 parents 7bfb97e + 81b2397 commit f54b9e1

18 files changed

Lines changed: 332 additions & 201 deletions

File tree

.github/workflows/continuous-integration-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119

120120
# Upload coverage to codecov.io
121121
- name: Codecov
122-
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 #v6.0.1
122+
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f #v7.0.0
123123
if: (success() || failure()) && runner.os == 'Linux'
124124
with:
125125
files: ./coverage/unit/coverage-final.json,./coverage/integration/coverage-final.json

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ node_modules
44
test/fixtures/workspace/.vscode/
55
*.vsix
66
coverage/
7+
.vscode-version
78
toFile
89
cache
910
dist/

.vscodeignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ doc/**
99
.gitattributes
1010
.github
1111
.gitignore
12+
.vscode-version
1213
header.js
1314
images/demo-featured-image.png
1415
images/gif/**

build/install-vscode.cjs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
const testElectron = require('@vscode/test-electron');
88
const { platform } = require('os');
99
const cp = require('child_process');
10+
const fs = require('fs');
1011
const path = require('path');
1112
const packageJson = require('../package.json');
1213

@@ -29,6 +30,12 @@ void testElectron.downloadAndUnzipVSCode().then((executable) => {
2930
vsCodeExecutable = path.join(path.dirname(executable), 'bin', 'code');
3031
}
3132

33+
// Save VSCode executable version for ExTester
34+
const match = executable.match(/(\d+\.\d+\.\d+)/);
35+
if (match) {
36+
fs.writeFileSync('.vscode-version', match[1]);
37+
}
38+
3239
const extensionRootPath = path.resolve(__dirname, '..');
3340
const vsCodeTest = path.resolve(path.join(extensionRootPath, '.vscode-test'));
3441
const userDataDir = path.join(vsCodeTest, 'user-data');

0 commit comments

Comments
 (0)