diff --git a/.vscodeignore b/.vscodeignore index 2a543a87..a60f4f73 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -1,12 +1,19 @@ .appveyor.yml +.git/**/* +.github/**/* +.gitignore +.prettierrc .travis.yml -.github -src/** +.vscode/**/* +*.vsix **/*.map -out/test/** -out/repo_scripts -resources/src +appveyor.yml +out/repo_scripts/**/* +out/test/**/* +out/tests/**/* package-lock.json +resources/src/**/* +src/**/* +tsconfig.base.json tsconfig.json -.vscode/** -.gitignore +tslint.json diff --git a/package-lock.json b/package-lock.json index 0f6b50f5..62ff6f42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { "name": "vscode-catch2-test-adapter", - "version": "2.0.0", + "version": "2.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { "@sinonjs/commons": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.0.2.tgz", - "integrity": "sha512-WR3dlgqJP4QNrLC4iXN/5/2WaLQQ0VijOOkmflqFGVJ6wLEpbSjo7c0ZeGIdtY8Crk7xBBp87sM6+Mkerz7alw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.3.0.tgz", + "integrity": "sha512-j4ZwhaHmwsCb4DlDOIWnI5YyKDNMoNThsmwEpfHx6a1EpsGZ9qYLxP++LMlmBRjtGptGHFsGItJ768snllFWpA==", "dev": true, "requires": { "type-detect": "4.0.8" @@ -52,9 +52,9 @@ "dev": true }, "@types/chai": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.6.tgz", - "integrity": "sha512-CBk7KTZt3FhPsEkYioG6kuCIpWISw+YI8o+3op4+NXwTpvAPxE1ES8+PY8zfaK2L98b1z5oq03UHa4VYpeUxnw==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.7.tgz", + "integrity": "sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA==", "dev": true }, "@types/deep-equal": { @@ -717,9 +717,9 @@ "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=" }, "fs-extra": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz", - "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "dev": true, "requires": { "graceful-fs": "^4.1.2", @@ -2001,12 +2001,12 @@ "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" }, "sinon": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.1.0.tgz", - "integrity": "sha512-ffASxced8xr8eU0EGyfj9K++bRCtv/NyOFOxl7UBD86YH97oZjVxvecMhObwRlXe27GRUa6rVFEn67khPZ29rQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.1.1.tgz", + "integrity": "sha512-iYagtjLVt1vN3zZY7D8oH7dkjNJEjLjyuzy8daX5+3bbQl8gaohrheB9VfH1O3L6LKuue5WTJvFluHiuZ9y3nQ==", "dev": true, "requires": { - "@sinonjs/commons": "^1.0.2", + "@sinonjs/commons": "^1.2.0", "@sinonjs/formatio": "^3.0.0", "@sinonjs/samsam": "^2.1.2", "diff": "^3.5.0", diff --git a/package.json b/package.json index d8e465d6..3c2696c6 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "xml2js": "^0.4.19" }, "devDependencies": { - "@types/chai": "^4.1.6", + "@types/chai": "^4.1.7", "@types/deep-equal": "^1.0.1", "@types/fs-extra": "^5.0.4", "@types/mocha": "^5.2.5", @@ -60,10 +60,10 @@ "@types/sinon": "^5.0.5", "@types/xml2js": "^0.4.3", "deep-equal": "^1.0.1", - "fs-extra": "^7.0.0", + "fs-extra": "^7.0.1", "request-promise": "4.2.2", - "sinon": "^7.1.0", - "vsce": "^1.52.0" + "sinon": "^7.1.1", + "vsce": "^1.53.0" }, "engines": { "vscode": "^1.23.0" diff --git a/src/repo_scripts/deploy.ts b/src/repo_scripts/deploy.ts index 6bb382e2..e3e387f4 100644 --- a/src/repo_scripts/deploy.ts +++ b/src/repo_scripts/deploy.ts @@ -47,10 +47,14 @@ function main(argv: string[]): Promise { console.log('deploying'); // pre-checks assert.strictEqual(path.basename(process.cwd()), githubRepoId); - assert.ok(process.env['TRAVIS_BRANCH'] != undefined); assert.ok(process.env['GITHUB_API_KEY'] != undefined); assert.ok(process.env['VSCE_PAT'] != undefined); + if (!process.env['TRAVIS_BRANCH']) { + console.log('not a branch, skipping deployment'); + return Promise.resolve(); + } + return updateChangelog().then((info: Info|undefined) => { if (info != undefined) { return Promise.resolve(info!) @@ -153,13 +157,12 @@ function updatePackageJson(info: Info) { } function gitCommitAndTag(info: Info) { - console.log('Creating commit and signed tag'); + console.log('Creating commit and tag'); return Promise.resolve() .then(() => { - assert.ok(process.env['TRAVIS_BRANCH'] != undefined); - const branch = process.env['TRAVIS_BRANCH']!; - return spawn('git', 'checkout', branch); + assert.ok(process.env['TRAVIS_BRANCH']); + return spawn('git', 'checkout', process.env['TRAVIS_BRANCH']!); }) .then(() => { return spawn( @@ -182,12 +185,9 @@ function gitCommitAndTag(info: Info) { return spawn('git', 'status'); }) .then(() => { - // [skip travis-ci]: because we dont want to build the new commit it - // again return spawn( 'git', 'commit', '-m', - '[Updated] Release info in CHANGELOG.md: ' + info.full!, '-m', - '[skip travis-ci]'); + '[Updated] Release info in CHANGELOG.md: ' + info.full!); }) .then(() => { return spawn(