all scripts at top

urbas · Mar 24, 2024 · 93dd11c · 93dd11c
1 parent 356e7c4
commit 93dd11c
Show file tree

Hide file tree

Showing 9 changed files with 134 additions and 76 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,20 +21,13 @@ jobs:
  target
  key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock', '**/.cargo/config.toml', '**/rust-toolchain.toml', '**/flake.nix', '**/flake.lock') }}
 
- - name: nixjs-rt
+ - name: Build
  run: |
- cd nixjs-rt
  eval "$(nix print-dev-env)"
 
- parallel --line-buffer --ctagstring "{}>\033[0m" scripts/{} ::: \
- check-nix-pkg.sh \
- check-npm-deps-hash.sh \
- check-npm.sh
-
- - name: rix
- run: |
- eval "$(nix print-dev-env)"
-
- parallel --line-buffer --ctagstring "{}>\033[0m" scripts/{} ::: \
- check-cargo.sh \
- check-nix-pkg.sh
+ parallel --line-buffer --ctagstring "{}>\033[0m" scripts/ci-{}.sh ::: \
+ build-rix \
+ check-nixjs-rt \
+ check-npm-deps-hash \
+ nix-pkg-nixjs-rt \
+ nix-pkg-rix
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,4 +25,4 @@ clap = "4.0.18"
 colored = "2.0.0"
 rowan = "0"
 rnix = "0"
-v8 = "0.80.0"
+v8 = "0.85.0"
diff --git a/scripts/check-cargo.sh → scripts/ci-build-rix.sh b/scripts/check-cargo.sh → scripts/ci-build-rix.sh
@@ -2,6 +2,12 @@
 
 set -ex
 
+(
+ cd nixjs-rt;
+ npm ci
+ npm run build
+)
+
 cargo fmt --check
 cargo clippy -- --deny "warnings"
-cargo test
+cargo test