Try with a devbox script

carlotm · Jan 31, 2025 · 774b5a6 · 774b5a6
1 parent bb15797
commit 774b5a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,24 +9,6 @@ jobs:
       - uses: jetify-com/[email protected]
         with:
           project-path: './test'
-
-      - name: Check packages are installed
-        working-directory: test
-        run: |
-          devbox run -- which solr
-          devbox run -- which curl
-          devbox run -- which exa
-
-      - name: Check files have been created
-        working-directory: test
-        run: |
-          [ -f .devbox/virtenv/carlotm.devbox-solr.solr/process-compose.yaml ]
-          [ -f .devbox/virtenv/carlotm.devbox-solr.solr/data/solr.xml ]
-          [ -d .devbox/virtenv/carlotm.devbox-solr.solr/logs ]
-          [ -d .devbox/virtenv/carlotm.devbox-solr.solr/pid ]
-
-      - name: Check env vars have been set
+      - name: Run the test script
         working-directory: test
-        run: |
-          devbox shell
-          echo ">>> ${SOLR_LOGS_DIR} <<<"
+        run: devbox run test
diff --git a/test/devbox.json b/test/devbox.json
@@ -4,5 +4,17 @@
     "include": ["github:carlotm/devbox-solr"],
     "env": {
         "MICHECK": "one_two_one_two"
+    },
+    "shell": {
+      "scripts": {
+        "test": [
+          "which solr curl exa",
+          "test -f .devbox/virtenv/carlotm.devbox-solr.solr/process-compose.yaml",
+          "test -f .devbox/virtenv/carlotm.devbox-solr.solr/data/solr.xml",
+          "test -d .devbox/virtenv/carlotm.devbox-solr.solr/logs",
+          "test -d .devbox/virtenv/carlotm.devbox-solr.solr/pid",
+          "test $SOLR_LOGS_DIR = $(pwd)/.devbox/virtenv/carlotm.devbox-solr.solr/logs"
+        ]
+      }
     }
 }