Skip to content

Commit

Permalink
use deno validator
Browse files Browse the repository at this point in the history
  • Loading branch information
Remi-Gau committed Sep 10, 2024
1 parent d8518c3 commit 513dbd3
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 16 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/run_tests_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ jobs:
sudo apt-get -y install octave liboctave-dev
- name: Info
run: octave --version
- uses: actions/setup-node@v4
- name: Install Deno
uses: denoland/setup-deno@v1
with:
node-version: 18
deno-version: v1.x
- uses: actions/setup-python@v5
name: Set up Python ${{ matrix.python-version }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- .github/workflows/*system*
- lib

# Allows you to run this workflow manually from the Actions tab
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,10 @@ jobs:
- name: test ${{ matrix.script }}
run: test ${{ matrix.script }}

- name: Install Node
uses: actions/setup-node@v4
- name: Install Deno
uses: denoland/setup-deno@v1
with:
node-version: 18
deno-version: v1.x

- name: Install python
uses: actions/setup-python@v5
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests_octave.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ jobs:
sudo apt-get -y -qq update
sudo apt-get -y install unzip wget git-annex
- name: Install Node
uses: actions/setup-node@v4
- name: Install Deno
uses: denoland/setup-deno@v1
with:
node-version: 18
deno-version: v1.x

- name: Install python
uses: actions/setup-python@v5
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ jobs:
if: matrix.test_type == 'system'
run: echo ${{ matrix.test_type }} test ${{ matrix.script }}

- name: Install Node
uses: actions/setup-node@v4
- name: Install Deno
uses: denoland/setup-deno@v1
with:
node-version: 18
deno-version: v1.x

- name: Install python
uses: actions/setup-python@v5
Expand Down
8 changes: 7 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bids/base_validator:1.13.1
FROM ubuntu:noble-20240801@sha256:8a37d68f4f73ebf3d4efafbcf66379bf3728902a8038616808f04e34a9ab63ee

LABEL org.opencontainers.image.source="https://github.com/cpp-lln-lab/bidspm"
LABEL org.opencontainers.image.url="https://github.com/cpp-lln-lab/bidspm"
Expand Down Expand Up @@ -41,6 +41,12 @@ RUN apt-get update -qq && \
/var/lib/apt/lists/* \
/var/log/apt/term*

## Install validator
RUN curl -fsSL https://deno.land/install.sh | sh && \
export DENO_INSTALL="/root/.deno" && \
export PATH="$DENO_INSTALL/bin:$PATH" && \
deno install -Agf -n bids-validator jsr:@bids/validator@1.14.12

## Install SPM
RUN mkdir /opt/spm12 && \
curl -SL https://github.com/spm/spm12/archive/r7771.tar.gz | \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ARG = -nodisplay -nosplash -nodesktop
.PHONY: help clean clean_demos clean_test update fix_submodule

install:
npm install -g bids-validator
deno install -Agf -n bids-validator jsr:@bids/validator
pip3 install .[dev]

help: ## Show what this Makefile can do
Expand Down
7 changes: 5 additions & 2 deletions bidspm.def
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ From: bids/base_validator:1.13.1
/var/lib/apt/lists/* \
/var/log/apt/term*

curl -fsSL https://deno.land/install.sh | sh
export DENO_INSTALL="/root/.deno"
export PATH="$DENO_INSTALL/bin:$PATH"
deno install -Agf -n bids-validator jsr:@bids/validator@1.14.12

mkdir /opt/spm12
curl -fsSL --retry 5 https://github.com/spm/spm12/archive/r7771.tar.gz | tar -xzC /opt/spm12 --strip-components 1
curl -fsSL --retry 5 https://raw.githubusercontent.com/spm/spm-octave/main/spm12_r7771.patch | patch -p0
Expand All @@ -55,8 +60,6 @@ From: bids/base_validator:1.13.1
git -C /opt/bidspm/ submodule foreach --recursive 'git clean --force -dfx'
git -C /opt/bidspm/ status



pip install --upgrade pip
pip install -r /opt/bidspm/requirements.txt
pip install /opt/bidspm
Expand Down

0 comments on commit 513dbd3

Please sign in to comment.