Skip to content

Commit 26d6d2b

Browse files
kt3kiuioiua
andauthored
chore: use new format for workspaces and re-enable using Deno canary and v1.x (denoland#5375)
* chore: use new format for workspaces * fixes --------- Co-authored-by: Asher Gomez <[email protected]>
1 parent 00831e1 commit 26d6d2b

File tree

7 files changed

+10
-32
lines changed

7 files changed

+10
-32
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ jobs:
1818
matrix:
1919
deno:
2020
- v1.x
21-
# TODO(iuioiua): Re-enable once workspaces functionality is fixed in canary
22-
# See: https://github.com/denoland/deno/issues/24422
23-
# - canary
21+
- canary
2422
os:
2523
- ubuntu-latest
2624
- windows-latest
@@ -51,9 +49,10 @@ jobs:
5149
TZ=America/Toronto deno test datetime
5250
if: matrix.os == 'ubuntu-latest'
5351

54-
- name: Type check browser compatible modules
55-
shell: bash
56-
run: deno task test:browser
52+
# TODO(kt3k): Rewrite test:browser task and enable this check
53+
#- name: Type check browser compatible modules
54+
# shell: bash
55+
# run: deno task test:browser
5756

5857
- name: Generate lcov
5958
run: deno task cov:gen
@@ -112,10 +111,7 @@ jobs:
112111
- name: Set up Deno
113112
uses: denoland/setup-deno@v1
114113
with:
115-
# TODO(iuioiua): Revert once workspaces functionality is fixed in canary
116-
# See: https://github.com/denoland/deno/issues/24422
117-
# deno-version: canary
118-
deno-version: v1.x
114+
deno-version: canary
119115

120116
- name: Format
121117
run: deno fmt --check
@@ -185,10 +181,7 @@ jobs:
185181
- name: Set up Deno
186182
uses: denoland/setup-deno@v1
187183
with:
188-
# TODO(iuioiua): Revert once workspaces functionality is fixed in canary
189-
# See: https://github.com/denoland/deno/issues/24422
190-
# deno-version: canary
191-
deno-version: v1.x
184+
deno-version: canary
192185

193186
- name: Publish (dry run)
194187
run: deno publish --dry-run

.github/workflows/workspace_publish.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ jobs:
2020
- name: Set up Deno
2121
uses: denoland/setup-deno@v1
2222
with:
23-
# TODO(iuioiua): Revert once workspaces functionality is fixed in canary
24-
# See: https://github.com/denoland/deno/issues/24422
25-
# deno-version: canary
26-
deno-version: v1.x
23+
deno-version: canary
2724

2825
- name: Format
2926
run: deno fmt --check

_tools/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
22

33
const workspaces = JSON.parse(await Deno.readTextFile("deno.json"))
4-
.workspaces as string[];
4+
.workspace as string[];
55
// deno-lint-ignore no-explicit-any
66
const denoConfig = {} as Record<string, any>;
77
for (const workspace of workspaces) {

deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
]
9393
}
9494
},
95-
"workspaces": [
95+
"workspace": [
9696
"./archive",
9797
"./assert",
9898
"./async",

fs/empty_dir_test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,6 @@ for (const s of scenes) {
207207
"--no-lock",
208208
"--quiet",
209209
"--no-prompt",
210-
"--config",
211-
"deno.json",
212210
];
213211

214212
if (s.read) {

fs/expand_glob_test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,6 @@ Deno.test(
291291
"run",
292292
"--quiet",
293293
"--no-lock",
294-
"--config",
295-
"deno.json",
296294
exampleUrl.toString(),
297295
],
298296
});

http/file_server_test.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,6 @@ Deno.test("serveDir() script prints help", async () => {
361361
"--no-check",
362362
"--quiet",
363363
"--no-lock",
364-
"--config",
365-
"deno.json",
366364
"http/file_server.ts",
367365
"--help",
368366
],
@@ -379,8 +377,6 @@ Deno.test("serveDir() script prints version", async () => {
379377
"--no-check",
380378
"--quiet",
381379
"--no-lock",
382-
"--config",
383-
"deno.json",
384380
"http/file_server.ts",
385381
"--version",
386382
],
@@ -409,8 +405,6 @@ Deno.test("serveDir() script fails with partial TLS args", async () => {
409405
"--allow-read",
410406
"--allow-net",
411407
"--no-lock",
412-
"--config",
413-
"deno.json",
414408
"http/file_server.ts",
415409
".",
416410
"--host",
@@ -1046,8 +1040,6 @@ function spawnDeno(args: string[], opts?: Deno.CommandOptions) {
10461040
"run",
10471041
"--no-lock",
10481042
"--quiet",
1049-
"--config",
1050-
"deno.json",
10511043
...args,
10521044
],
10531045
stdout: "piped",

0 commit comments

Comments
 (0)