From 8b9a0a928023a404721eb8730512ef1223901fe0 Mon Sep 17 00:00:00 2001 From: Jordan Santell Date: Wed, 5 Mar 2025 14:31:38 -0800 Subject: [PATCH] chore: require deno.lock to be committed. serialize deno workspace tests. --- .../workflows/{unit-tests.yml => deno.yml} | 13 ++++++-- .github/workflows/lint.yml | 33 ------------------- typescript/packages/deno-web-test/deno.json | 4 +-- typescript/packages/deno.lock | 9 ++--- typescript/packages/scripts/utils.ts | 14 -------- 5 files changed, 14 insertions(+), 59 deletions(-) rename .github/workflows/{unit-tests.yml => deno.yml} (74%) delete mode 100644 .github/workflows/lint.yml delete mode 100644 typescript/packages/scripts/utils.ts diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/deno.yml similarity index 74% rename from .github/workflows/unit-tests.yml rename to .github/workflows/deno.yml index 67a92d45b..7847625e5 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/deno.yml @@ -1,4 +1,4 @@ -name: Unit Tests +name: Deno Tests on: push: @@ -9,9 +9,8 @@ on: - main jobs: - test: + deno: runs-on: ubuntu-latest - timeout-minutes: 10 defaults: run: working-directory: ./typescript/packages @@ -28,6 +27,14 @@ jobs: ~/.deno ~/.cache/deno key: ${{ runner.os }}-deno-${{ hashFiles('**/deno.json') }} + - name: Install dependencies + working-directory: typescript/packages + # Errors if `deno.lock` file was not + # committed with the current change. + run: deno install --frozen=true + - name: Lint + working-directory: typescript/packages + run: deno lint # For deno-web-test browser tests # https://github.com/lino-levan/astral/blob/f5ef833b2c5bde3783564a6b925073d5d46bb4b8/README.md#no-usable-sandbox-with-user-namespace-cloning-enabled - name: Disable AppArmor diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index 2c019e122..000000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Lint - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - test: - runs-on: ubuntu-latest - timeout-minutes: 10 - defaults: - run: - working-directory: ./typescript/packages - steps: - - uses: actions/checkout@v4 - - name: Setup Deno - uses: denoland/setup-deno@v2 - with: - deno-version: "2.2.2" - - name: Cache dependencies - uses: actions/cache@v3 - with: - path: | - ~/.deno - ~/.cache/deno - key: ${{ runner.os }}-deno-${{ hashFiles('**/deno.json') }} - - name: Lint - working-directory: typescript/packages - run: deno lint diff --git a/typescript/packages/deno-web-test/deno.json b/typescript/packages/deno-web-test/deno.json index 4faa055a6..d3d0676b4 100644 --- a/typescript/packages/deno-web-test/deno.json +++ b/typescript/packages/deno-web-test/deno.json @@ -8,9 +8,7 @@ "./cli": "./cli.ts" }, "imports": { - "@astral/astral": "jsr:@astral/astral", "esbuild": "npm:esbuild", - "@luca/esbuild-deno-loader": "jsr:@luca/esbuild-deno-loader", - "@std/http": "jsr:@std/http" + "@luca/esbuild-deno-loader": "jsr:@luca/esbuild-deno-loader" } } diff --git a/typescript/packages/deno.lock b/typescript/packages/deno.lock index 16aabfb51..b0c7c5c50 100644 --- a/typescript/packages/deno.lock +++ b/typescript/packages/deno.lock @@ -32,14 +32,13 @@ "jsr:@std/expect@1": "1.0.13", "jsr:@std/fmt@0.221": "0.221.0", "jsr:@std/fmt@1.0.3": "1.0.3", - "jsr:@std/fmt@^1.0.5": "1.0.5", + "jsr:@std/fmt@^1.0.5": "1.0.6", "jsr:@std/fs@*": "1.0.11", "jsr:@std/fs@0.221": "0.221.0", "jsr:@std/fs@1": "1.0.11", "jsr:@std/fs@^1.0.10": "1.0.11", "jsr:@std/fs@^1.0.9": "1.0.11", "jsr:@std/html@^1.0.3": "1.0.3", - "jsr:@std/http@*": "1.0.13", "jsr:@std/http@1": "1.0.13", "jsr:@std/internal@^1.0.5": "1.0.5", "jsr:@std/io@0.225.0": "0.225.0", @@ -257,8 +256,8 @@ "@std/fmt@1.0.3": { "integrity": "97765c16aa32245ff4e2204ecf7d8562496a3cb8592340a80e7e554e0bb9149f" }, - "@std/fmt@1.0.5": { - "integrity": "0cfab43364bc36650d83c425cd6d99910fc20c4576631149f0f987eddede1a4d" + "@std/fmt@1.0.6": { + "integrity": "a2c56a69a2369876ddb3ad6a500bb6501b5bad47bb3ea16bfb0c18974d2661fc" }, "@std/fs@0.221.0": { "integrity": "028044450299de8ed5a716ade4e6d524399f035513b85913794f4e81f07da286", @@ -7307,9 +7306,7 @@ }, "deno-web-test": { "dependencies": [ - "jsr:@astral/astral@*", "jsr:@luca/esbuild-deno-loader@*", - "jsr:@std/http@*", "npm:esbuild@*" ] }, diff --git a/typescript/packages/scripts/utils.ts b/typescript/packages/scripts/utils.ts deleted file mode 100644 index 6a3a0c5af..000000000 --- a/typescript/packages/scripts/utils.ts +++ /dev/null @@ -1,14 +0,0 @@ -import * as esbuild from "esbuild"; -import { denoPlugins } from "@luca/esbuild-deno-loader"; - -export async function bundle(inputPath: string, outputPath: string) { - const result = await esbuild.build({ - plugins: [...denoPlugins()], - entryPoints: [inputPath], - outfile: outputPath, - bundle: true, - format: "esm", - }); - - esbuild.stop(); -}