Skip to content

Commit 1296848

Browse files
authored
refactor: switch to codecov-uploader GitHub Action (#5303)
* refactor: switch to codecov-uploader GitHub Action codecov deprecated their Node wrapper for uploading coverage reports. This removes that and uses their new uploaded along with the v2 GitHub Action they maintain. * fix: update broken integration test
1 parent c51ff3b commit 1296848

File tree

4 files changed

+8
-78
lines changed

4 files changed

+8
-78
lines changed

.github/workflows/ci.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,9 @@ jobs:
164164
if: success()
165165

166166
- name: Upload coverage report to Codecov
167-
run: yarn coverage
167+
uses: codecov/codecov-action@v2
168+
with:
169+
token: ${{ secrets.CODECOV_TOKEN }}
168170
if: success()
169171

170172
# The release package does not contain any native modules

package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
"test": "echo 'Run yarn test:unit or yarn test:e2e' && exit 1",
3232
"ci": "./ci/dev/ci.sh",
3333
"watch": "VSCODE_DEV=1 VSCODE_IPC_HOOK_CLI= NODE_OPTIONS='--max_old_space_size=32384 --trace-warnings' ts-node ./ci/dev/watch.ts",
34-
"icons": "./ci/dev/gen_icons.sh",
35-
"coverage": "codecov"
34+
"icons": "./ci/dev/gen_icons.sh"
3635
},
3736
"main": "out/node/entry.js",
3837
"devDependencies": {
@@ -53,7 +52,6 @@
5352
"@typescript-eslint/eslint-plugin": "^5.23.0",
5453
"@typescript-eslint/parser": "^5.23.0",
5554
"audit-ci": "^6.0.0",
56-
"codecov": "^3.8.3",
5755
"doctoc": "^2.0.0",
5856
"eslint": "^7.7.0",
5957
"eslint-config-prettier": "^8.1.0",

test/integration/listExtensions.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import extract from "extract-zip"
12
import { rename } from "fs/promises"
23
import path from "path"
3-
import extract from "extract-zip"
44
import { clean, tmpdir } from "../utils/helpers"
55
import { runCodeServerCommand } from "../utils/runCodeServerCommand"
66

@@ -21,7 +21,7 @@ describe("--list-extensions", () => {
2121
const pathToUnpackedExtension = path.join(tempDir, `${extName}-${extVersion}`)
2222
const tempPathToUnpackedExtension = path.join(tempDir, `${extName}-temp`)
2323
await extract(extensionFixture, { dir: tempPathToUnpackedExtension })
24-
await rename(path.join(tempPathToUnpackedExtension, "extension", pathToUnpackedExtension))
24+
await rename(path.join(tempPathToUnpackedExtension, "extension"), pathToUnpackedExtension)
2525
})
2626
it("should list installed extensions", async () => {
2727
const { stdout } = await runCodeServerCommand([...setupFlags, "--list-extensions"])

yarn.lock

+2-72
Original file line numberDiff line numberDiff line change
@@ -731,11 +731,6 @@ argparse@^2.0.1:
731731
resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
732732
integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
733733

734-
735-
version "0.0.2"
736-
resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab"
737-
integrity sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=
738-
739734
arr-union@^3.1.0:
740735
version "3.1.0"
741736
resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
@@ -1031,17 +1026,6 @@ clone-regexp@^2.1.0:
10311026
dependencies:
10321027
is-regexp "^2.0.0"
10331028

1034-
codecov@^3.8.3:
1035-
version "3.8.3"
1036-
resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.8.3.tgz#9c3e364b8a700c597346ae98418d09880a3fdbe7"
1037-
integrity sha512-Y8Hw+V3HgR7V71xWH2vQ9lyS358CbGCldWlJFR0JirqoGtOoas3R3/OclRTvgUYFK29mmJICDPauVKmpqbwhOA==
1038-
dependencies:
1039-
argv "0.0.2"
1040-
ignore-walk "3.0.4"
1041-
js-yaml "3.14.1"
1042-
teeny-request "7.1.1"
1043-
urlgrey "1.0.0"
1044-
10451029
collapse-white-space@^1.0.2:
10461030
version "1.0.6"
10471031
resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
@@ -1854,13 +1838,6 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
18541838
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
18551839
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
18561840

1857-
fast-url-parser@^1.1.3:
1858-
version "1.1.3"
1859-
resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"
1860-
integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0=
1861-
dependencies:
1862-
punycode "^1.3.2"
1863-
18641841
fastest-levenshtein@^1.0.12:
18651842
version "1.0.12"
18661843
resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
@@ -2302,13 +2279,6 @@ [email protected]:
23022279
dependencies:
23032280
safer-buffer ">= 2.1.2 < 3"
23042281

2305-
2306-
version "3.0.4"
2307-
resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
2308-
integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
2309-
dependencies:
2310-
minimatch "^3.0.4"
2311-
23122282
ignore@^4.0.6:
23132283
version "4.0.6"
23142284
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -2573,7 +2543,7 @@ js-tokens@^4.0.0:
25732543
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
25742544
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
25752545

2576-
js-yaml@3.14.1, js-yaml@^3.13.1:
2546+
js-yaml@^3.13.1:
25772547
version "3.14.1"
25782548
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
25792549
integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -3018,7 +2988,7 @@ node-addon-api@^4.3.0:
30182988
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
30192989
integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
30202990

3021-
node-fetch@^2.6.1, node-fetch@^2.6.5, node-fetch@^2.6.7:
2991+
node-fetch@^2.6.5, node-fetch@^2.6.7:
30222992
version "2.6.7"
30232993
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
30242994
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
@@ -3503,11 +3473,6 @@ pseudomap@^1.0.2:
35033473
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
35043474
integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
35053475

3506-
punycode@^1.3.2:
3507-
version "1.4.1"
3508-
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
3509-
integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
3510-
35113476
punycode@^2.1.0:
35123477
version "2.1.1"
35133478
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -4021,13 +3986,6 @@ stream-combiner@^0.2.2:
40213986
duplexer "~0.1.1"
40223987
through "~2.3.4"
40233988

4024-
stream-events@^1.0.5:
4025-
version "1.0.5"
4026-
resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5"
4027-
integrity sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==
4028-
dependencies:
4029-
stubs "^3.0.0"
4030-
40313989
"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
40323990
version "4.2.3"
40333991
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -4112,11 +4070,6 @@ structured-source@^3.0.2:
41124070
dependencies:
41134071
boundary "^1.0.1"
41144072

4115-
stubs@^3.0.0:
4116-
version "3.0.0"
4117-
resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
4118-
integrity sha1-6NK6H6nJBXAwPAMLaQD31fiavls=
4119-
41204073
style-search@^0.1.0:
41214074
version "0.1.0"
41224075
resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
@@ -4246,17 +4199,6 @@ tar@^6.1.11, tar@^6.1.9:
42464199
mkdirp "^1.0.3"
42474200
yallist "^4.0.0"
42484201

4249-
4250-
version "7.1.1"
4251-
resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-7.1.1.tgz#2b0d156f4a8ad81de44303302ba8d7f1f05e20e6"
4252-
integrity sha512-iwY6rkW5DDGq8hE2YgNQlKbptYpY5Nn2xecjQiNjOXWbKzPGUfmeUBCSQbbr306d7Z7U2N0TPl+/SwYRfua1Dg==
4253-
dependencies:
4254-
http-proxy-agent "^4.0.0"
4255-
https-proxy-agent "^5.0.0"
4256-
node-fetch "^2.6.1"
4257-
stream-events "^1.0.5"
4258-
uuid "^8.0.0"
4259-
42604202
text-table@^0.2.0:
42614203
version "0.2.0"
42624204
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -4535,13 +4477,6 @@ uri-js@^4.2.2:
45354477
dependencies:
45364478
punycode "^2.1.0"
45374479

4538-
4539-
version "1.0.0"
4540-
resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-1.0.0.tgz#72d2f904482d0b602e3c7fa599343d699bbe1017"
4541-
integrity sha512-hJfIzMPJmI9IlLkby8QrsCykQ+SXDeO2W5Q9QTW3QpqZVTx4a/K7p8/5q+/isD8vsbVaFgql/gvAoQCRQ2Cb5w==
4542-
dependencies:
4543-
fast-url-parser "^1.1.3"
4544-
45454480
util-deprecate@^1.0.1, util-deprecate@^1.0.2:
45464481
version "1.0.2"
45474482
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -4552,11 +4487,6 @@ [email protected]:
45524487
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
45534488
integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
45544489

4555-
uuid@^8.0.0:
4556-
version "8.3.2"
4557-
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
4558-
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
4559-
45604490
v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
45614491
version "2.3.0"
45624492
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"

0 commit comments

Comments
 (0)