Merge pull request #1 from bids-standard/fix/deno_2_test_and_build

Fix/deno 2 test and build

Author: effigies

.dockerignore

@@ -1,3 +1,2 @@
 tests
-.git
 node_modules

.github/workflows/deno_tests.yml

@@ -22,10 +22,10 @@ jobs:
       - name: Save describe stamp
         id: describe
         run: echo version=$( git describe ) >> $GITHUB_OUTPUT
-      - uses: denoland/setup-deno@v1
+      - uses: denoland/setup-deno@v2
         with:
-          deno-version: v1.x
-      - run: ./build.ts
+          deno-version: v2.x
+      - run: deno --node-modules-dir=auto -A ./build.ts
         working-directory: ./bids-validator
       - run: deno run -A ./bids-validator/dist/validator/bids-validator.js --version
       - uses: actions/upload-artifact@v4
@@ -52,14 +52,17 @@ jobs:
           submodules: true
       - uses: denoland/setup-deno@v1
         with:
-          deno-version: v1.x
+          deno-version: v2.x
       - name: Set permissions with network access
         run: echo 'PERMS=--allow-read --allow-write --allow-env --allow-run --allow-net' >> $GITHUB_ENV
         if: ${{ matrix.allow-net }}
       - name: Set permissions without network access
         run: echo 'PERMS=--allow-read --allow-write --allow-env --allow-run --deny-net' >> $GITHUB_ENV
         if: ${{ ! matrix.allow-net }}
-      - run: deno test $PERMS --coverage=cov/ src/
+      - name: Disable example that requires network access
+        run: touch tests/data/bids-examples/xeeg_hed_score/.SKIP_VALIDATION
+        if: ${{ ! matrix.allow-net }}
+      - run: deno test --node-modules-dir=auto $PERMS --coverage=cov/ src/
       - name: Collect coverage
         run: deno coverage cov/ --lcov --output=coverage.lcov
         if: ${{ always() }}

.github/workflows/schema_web_build.yml

@@ -17,9 +17,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: denoland/setup-deno@v1
+      - uses: denoland/setup-deno@v2
         with:
-          deno-version: v1.x
+          deno-version: v2.x
       - run: deno task build
         working-directory: ./web
       - uses: actions/upload-artifact@v4

.github/workflows/schema_web_deploy.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: denoland/setup-deno@v1
         with:
-          deno-version: v1.x
+          deno-version: v2.x
       - run: deno task build
         working-directory: ./web
       - name: Install NPM deps

.gitignore

@@ -11,7 +11,6 @@ coverage/
 __pycache__/
 dist/
 *.egg-info/
-bids-validator-web/out/
 .next/
 
 # Only use global yarn.lock

Dockerfile

@@ -0,0 +1,30 @@
+ARG BASE_IMAGE=denoland/deno:2.0.1
+FROM ${BASE_IMAGE} AS build
+WORKDIR /src
+
+RUN apt-get update && \
+    apt-get install -y git jq && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ADD . .
+RUN export VERSION=`git -C . -c safe.directory=* describe --tags --always` && \
+    jq -r ".version|=\"$VERSION\"" bids-validator/deno.json > ._deno.json
+
+WORKDIR /src/bids-validator
+RUN deno cache ./bids-validator-deno
+RUN ./build.ts
+
+FROM ${BASE_IMAGE} AS base
+WORKDIR /src
+COPY . .
+COPY --from=build /src/._deno.json /src/bids-validator/deno.json
+WORKDIR /src/bids-validator
+RUN deno cache ./bids-validator-deno
+ENTRYPOINT ["./bids-validator-deno"]
+
+FROM ${BASE_IMAGE} AS min
+WORKDIR /src
+COPY --from=build /src/bids-validator/dist/validator/* .
+
+ENTRYPOINT ["deno", "-A", "./bids-validator.js"]

README.md

@@ -6,7 +6,7 @@
  */
 import * as esbuild from 'https://deno.land/x/[email protected]/mod.js'
 import { parse } from 'https://deno.land/[email protected]/flags/mod.ts'
-import { denoPlugins } from "jsr:@luca/esbuild-deno-loader@0.10.3"
+import { denoPlugins } from "jsr:@luca/esbuild-deno-loader@0.11.0"
 import * as path from "https://deno.land/[email protected]/path/mod.ts"
 import { getVersion } from './src/version.ts'