Move helper scripts into subdirs

rcowsill · May 30, 2024 · b76d854 · b76d854
1 parent 5d4736f
commit b76d854
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/.github/scripts/shellcheck.sh b/.github/scripts/shellcheck.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-shellcheck .github/scripts/*.sh
+shopt -s globstar
+shellcheck .github/scripts/**/*.sh
diff --git a/.github/scripts/validate.sh b/.github/scripts/validate.sh
@@ -9,4 +9,4 @@ RUN_OPTS=(
 IMAGE_DIGEST="sha256:f4ceed83064a348fd23529039ce8634f8ba49ce5df26a5f10f94adf384cbebce"
 VNU_IMAGE="ghcr.io/validator/validator@$IMAGE_DIGEST"
 
-docker run "${RUN_OPTS[@]}" "$VNU_IMAGE" bash - <.github/scripts/vnu.sh
+docker run "${RUN_OPTS[@]}" "$VNU_IMAGE" bash - <.github/scripts/validate/vnu.sh
diff --git a/.github/scripts/vnu.sh → .github/scripts/validate/vnu.sh b/.github/scripts/vnu.sh → .github/scripts/validate/vnu.sh
diff --git a/.github/scripts/wasm.sh b/.github/scripts/wasm.sh
@@ -10,4 +10,4 @@ RUN_OPTS=(
 IMAGE_DIGEST="sha256:f9479effb0d095fea1c8501b57c18d13876a5e3bfebcb71f0da68a0fe49c935f"
 EMSDK_IMAGE="emscripten/emsdk@$IMAGE_DIGEST"
 
-docker run "${RUN_OPTS[@]}" "$EMSDK_IMAGE" bash - <.github/scripts/cmake.sh
+docker run "${RUN_OPTS[@]}" "$EMSDK_IMAGE" bash - <.github/scripts/wasm/cmake.sh
diff --git a/.github/scripts/cmake.sh → .github/scripts/wasm/cmake.sh b/.github/scripts/cmake.sh → .github/scripts/wasm/cmake.sh
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
@@ -3,11 +3,11 @@ on:
   pull_request:
     paths:
       - ".github/workflows/shellcheck.yml"
-      - ".github/scripts/*.sh"
+      - ".github/scripts/**.sh"
   push:
     paths:
       - ".github/workflows/shellcheck.yml"
-      - ".github/scripts/*.sh"
+      - ".github/scripts/**.sh"
 
 permissions:
   contents: read

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -4,14 +4,14 @@ on:
     paths:
       - ".github/workflows/validate.yml"
       - ".github/scripts/validate.sh"
-      - ".github/scripts/vnu.sh"
+      - ".github/scripts/validate/*.sh"
       - ".vnurc"
       - "_site/**"
   push:
     paths:
       - ".github/workflows/validate.yml"
       - ".github/scripts/validate.sh"
-      - ".github/scripts/vnu.sh"
+      - ".github/scripts/validate/*.sh"
       - ".vnurc"
       - "_site/**"