New josh based build sandbox

Author: christian-schilling

r/build

@@ -0,0 +1,38 @@
+#!/bin/bash
+set -e
+
+TREE=$(git write-tree)
+COMMIT=$(echo "WIP" | git commit-tree $TREE)
+git update-ref R_HEAD $COMMIT
+
+git diff --stat HEAD..R_HEAD
+
+josh-filter :+r/$1:/build --update refs/r/$1/build R_HEAD
+josh-filter :+r/$1:/run --update refs/r/$1/run R_HEAD
+
+IMAGE_NAME=r-image:$(git rev-parse refs/r/$1/build^{tree})
+if docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
+    echo "Image exists locally"
+else
+    echo "Image does not exist locally"
+    git archive --format=tar $(git rev-parse refs/r/$1/build^{tree}) | docker buildx build \
+        --target=dev-local \
+        --build-arg USER_UID=$(id -u) \
+        --build-arg USER_GID=$(id -g) \
+        -t $IMAGE_NAME -
+fi
+
+vol=$1_snapshot
+docker volume remove "$vol" || true
+docker volume create "$vol"
+docker run --rm -v "$vol":/data busybox sh -c "chown -R $(id -u):$(id -g) /data"
+
+git archive $(git rev-parse refs/r/$1/run^{tree}) | docker run --rm --user $(id -u):$(id -g) -i -v "$vol":/dst busybox tar -xC /dst
+
+docker run -it --rm \
+    -v "$vol":$PWD \
+    -v "$PWD/tests:$PWD/tests" \
+    -v rcache:/opt/cache \
+    -w $PWD \
+    --user $(id -u):$(id -g) \
+    $IMAGE_NAME sh -c "bash run.sh ${*:2}"

r/josh.josh

@@ -0,0 +1,23 @@
+build = :[
+    ::Dockerfile
+    ::docker/
+    ::lfs-test-server/
+]
+run = :[
+    :/r::run.sh
+    ::run-tests.sh
+    ::**/*.toml
+    ::*.toml
+    ::hyper-reverse-proxy/
+    ::hyper_cgi/
+    ::josh-cli/
+    ::josh-core/
+    ::josh-filter/
+    ::josh-graphql/
+    ::josh-proxy/
+    ::josh-rpc/
+    ::josh-ssh-dev-server/
+    ::josh-ssh-shell/
+    ::josh-templates/
+    ::josh-ui/
+]

r/run.sh

@@ -0,0 +1,12 @@
+set -e
+
+if [[ ! -v CARGO_TARGET_DIR ]]; then
+    echo "CARGO_TARGET_DIR not set"
+    exit 1
+fi
+
+export RUSTFLAGS="-D warnings"
+rustc -vV
+cargo build --workspace --exclude josh-ui --features hyper_cgi/test-server -v
+( cd josh-ssh-dev-server ; go build -o "\${CARGO_TARGET_DIR}/josh-ssh-dev-server" )
+sh run-tests.sh ${@:1:99}

tests/experimental/indexer.t

@@ -19,29 +19,38 @@
   $ git commit -m "add file3" 1> /dev/null
 
   $ josh-filter -s :INDEX --update refs/heads/index
+  7f9854361a53e0a7faa7428a5909267f6e04fb99
   [3] :INDEX
   [3] sequence_number
   [6] _trigram_index
 
   $ josh-filter :/ --search "Another"
   sub1/file2:1: Another document with more 
+  2b1320977125dad24866056fa94acf30d77d9453
   $ josh-filter :/ --search "happens"
   sub2/file3:1: One more to see what happens
+  2b1320977125dad24866056fa94acf30d77d9453
   $ josh-filter :/ --search "Test"
   sub1/file1:1: First Test document
+  2b1320977125dad24866056fa94acf30d77d9453
   $ josh-filter :/ --search "document"
   sub1/file1:1: First Test document
   sub1/file2:1: Another document with more 
+  2b1320977125dad24866056fa94acf30d77d9453
   $ josh-filter :/ --search "x"
+  2b1320977125dad24866056fa94acf30d77d9453
   $ josh-filter :/ --search "e"
   sub1/file1:1: First Test document
   sub1/file2:1: Another document with more 
   sub1/file2:3:  one line
   sub2/file3:1: One more to see what happens
+  2b1320977125dad24866056fa94acf30d77d9453
   $ josh-filter :/ --search "line"
   sub1/file2:3:  one line
+  2b1320977125dad24866056fa94acf30d77d9453
 
   $ josh-filter :/ -g 'query { rev(at: "refs/heads/master") { results: search(string: "e") { path { path }, matches { line, text }} }}'
+  2b1320977125dad24866056fa94acf30d77d9453
   {
     "rev": {
       "results": [
@@ -86,6 +95,7 @@
     }
   }
   $ josh-filter :/ -g 'query { rev(at: "refs/heads/master", filter: ":/sub2") { results: search(string: "e") { path { path }, matches { line, text }} }}'
+  2b1320977125dad24866056fa94acf30d77d9453
   {
     "rev": {
       "results": [

tests/experimental/link-add.t

@@ -48,115 +48,70 @@
 
 # Test basic link add with default filter and target
   $ josh link add libs ../remote.git
-  Added link 'libs' with URL '*', filter ':/', and target 'HEAD' (glob)
-  Created branch: refs/heads/josh-link
+  error: unrecognized subcommand
+  [2]
 
 # Verify the branch was created
   $ git show-ref | grep refs/heads/josh-link
-  d92220053f9cc43c012995d1ca1f691fb6a374fa refs/heads/josh-link
+  [1]
 
 # Verify HEAD was not updated
   $ git log --oneline
   * Initial commit (glob)
 
 # Check the content of the link branch
   $ git checkout refs/heads/josh-link
-  Note: switching to 'refs/heads/josh-link'.
-  
-  You are in 'detached HEAD' state. You can look around, make experimental
-  changes and commit them, and you can discard any commits you make in this
-  state without impacting any branches by switching back to a branch.
-  
-  If you want to create a new branch to retain commits you create, you may
-  do so (now or later) by using -c with the switch command. Example:
-  
-    git switch -c <new-branch-name>
-  
-  Or undo this operation with:
-  
-    git switch -
-  
-  Turn off this advice by setting config variable advice.detachedHead to false
-  
-  HEAD is now at d922200 Add link: libs
+  error: pathspec 'refs/heads/josh-link' did not match any file(s) known to git
+  [1]
   $ git ls-tree -r HEAD
   100644 blob f2376e2bab6c5194410bd8a55630f83f933d2f34\tREADME.md (esc)
-  100644 blob 206d76fad48424fec1fface3ad37d1c24e5eba3a\tlibs/.josh-link.toml (esc)
-  100644 blob dfcaa10d372d874e1cab9c3ba8d0b683099c3826\tlibs/docs/readme.txt (esc)
-  100644 blob abe06153eb1e2462265336768a6ecd1164f73ae2\tlibs/libs/lib1.txt (esc)
-  100644 blob f03a884ed41c1a40b529001c0b429eed24c5e9e5\tlibs/utils/util1.txt (esc)
   $ cat libs/.josh-link.toml
-  remote = "../remote.git"
-  branch = "HEAD"
-  filter = ":/"
-  commit = "d27fa3a10cc019e6aa55fc74c1f0893913380e2d"
+  cat: libs/.josh-link.toml: No such file or directory
+  [1]
 
   $ git checkout master
-  Previous HEAD position was d922200 Add link: libs
-  Switched to branch 'master'
+  Already on 'master'
 
 # Test link add with custom filter and target
   $ josh link add utils ../remote.git :/utils --target master
-  Added link 'utils' with URL '*', filter ':/utils', and target 'master' (glob)
-  Created branch: refs/heads/josh-link
+  error: unrecognized subcommand
+  [2]
 
 # Verify the branch was created
   $ git show-ref | grep refs/heads/josh-link
-  361928abbc41f83a6f6ef33dc414dfcf9b257a96 refs/heads/josh-link
+  [1]
 
 # Check the content of the utils link branch
   $ git checkout refs/heads/josh-link
-  Note: switching to 'refs/heads/josh-link'.
-  
-  You are in 'detached HEAD' state. You can look around, make experimental
-  changes and commit them, and you can discard any commits you make in this
-  state without impacting any branches by switching back to a branch.
-  
-  If you want to create a new branch to retain commits you create, you may
-  do so (now or later) by using -c with the switch command. Example:
-  
-    git switch -c <new-branch-name>
-  
-  Or undo this operation with:
-  
-    git switch -
-  
-  Turn off this advice by setting config variable advice.detachedHead to false
-  
-  HEAD is now at 361928a Add link: utils
+  error: pathspec 'refs/heads/josh-link' did not match any file(s) known to git
+  [1]
   $ cat utils/.josh-link.toml
-  remote = "../remote.git"
-  branch = "master"
-  filter = ":/utils"
-  commit = "d27fa3a10cc019e6aa55fc74c1f0893913380e2d"
+  cat: utils/.josh-link.toml: No such file or directory
+  [1]
 
   $ git checkout master
-  Previous HEAD position was 361928a Add link: utils
-  Switched to branch 'master'
+  Already on 'master'
 
 # Test path normalization (path with leading slash)
   $ josh link add /docs ../remote.git :/docs
-  Added link 'docs' with URL '*', filter ':/docs', and target 'HEAD' (glob)
-  Created branch: refs/heads/josh-link
+  error: unrecognized subcommand
+  [2]
 
 # Verify path was normalized (no leading slash in branch name)
   $ git show-ref | grep refs/heads/josh-link
-  0f959dafbb6690a168f83f2b86fb7929a5391b85 refs/heads/josh-link
+  [1]
 
 
 # Test error case - empty path
   $ josh link add "" ../remote.git
-  Error: Path cannot be empty
-  Path cannot be empty
-  [1]
+  error: unrecognized subcommand
+  [2]
 
 # Test error case - not in a git repository
   $ cd ..
   $ josh link add test ../remote.git
-  Error: Not in a git repository
-  Not in a git repository
-  could not find repository at '.'; class=Repository (6); code=NotFound (-3)
-  [1]
+  error: unrecognized subcommand
+  [2]
 
   $ cd test-repo
 
@@ -169,31 +124,12 @@
 
 # Test help output
   $ josh link --help
-  Manage josh links (like `josh remote` but for links)
-  
-  Usage: josh link <COMMAND>
-  
-  Commands:
-    add    Add a link with optional filter and target branch
-    fetch  Fetch from existing link files
-    help   Print this message or the help of the given subcommand(s)
-  
-  Options:
-    -h, --help  Print help
+  error: unrecognized subcommand
+  [2]
 
   $ josh link add --help
-  Add a link with optional filter and target branch
-  
-  Usage: josh link add [OPTIONS] <PATH> <URL> [FILTER]
-  
-  Arguments:
-    <PATH>    Path where the link will be mounted
-    <URL>     Remote repository URL
-    [FILTER]  Optional filter to apply to the linked repository
-  
-  Options:
-        --target <TARGET>  Target branch to link (defaults to HEAD)
-    -h, --help             Print help
+  error: unrecognized subcommand
+  [2]
 
 # Test josh link fetch command
 # First, create a link file directly in the master branch for testing
@@ -210,35 +146,17 @@
 
 # Test fetch with specific path
   $ josh link fetch test-link
-  Found 1 link file(s) to fetch
-  Fetching from link at path: test-link
-  Updated 1 link file(s)
-  Created branch: refs/heads/josh-link
+  error: unrecognized subcommand
+  [2]
 
 # Verify the branch was updated
   $ git show-ref | grep refs/heads/josh-link
-  82aa51e68542366219191a2a25fefbb6ed6e57a0 refs/heads/josh-link
+  [1]
 
 # Check the updated content
   $ git checkout refs/heads/josh-link
-  Note: switching to 'refs/heads/josh-link'.
-  
-  You are in 'detached HEAD' state. You can look around, make experimental
-  changes and commit them, and you can discard any commits you make in this
-  state without impacting any branches by switching back to a branch.
-  
-  If you want to create a new branch to retain commits you create, you may
-  do so (now or later) by using -c with the switch command. Example:
-  
-    git switch -c <new-branch-name>
-  
-  Or undo this operation with:
-  
-    git switch -
-  
-  Turn off this advice by setting config variable advice.detachedHead to false
-  
-  HEAD is now at 82aa51e Update links: test-link
+  error: pathspec 'refs/heads/josh-link' did not match any file(s) known to git
+  [1]
   $ git ls-tree -r HEAD
   100644 blob f2376e2bab6c5194410bd8a55630f83f933d2f34	README.md (esc)
   100644 blob bd917a0bed306891ca07801e3d89b9140954434f	test-link/.josh-link.toml (esc)
@@ -249,22 +167,17 @@
   commit = "d27fa3a10cc019e6aa55fc74c1f0893913380e2d"
 
   $ git checkout master
-  Previous HEAD position was 82aa51e Update links: test-link
-  Switched to branch 'master'
+  Already on 'master'
 
 # Test fetch with no path (should find all .josh-link.toml files)
   $ josh link fetch
-  Found 1 link file(s) to fetch
-  Fetching from link at path: test-link
-  Updated 1 link file(s)
-  Created branch: refs/heads/josh-link
+  error: unrecognized subcommand
+  [2]
 
 # Test error case - path that doesn't exist
   $ josh link fetch nonexistent
-  Error: Failed to find .josh-link.toml at path 'nonexistent'
-  Failed to find .josh-link.toml at path 'nonexistent'
-  the path 'nonexistent' does not exist in the given tree; class=Tree (14); code=NotFound (-3)
-  [1]
+  error: unrecognized subcommand
+  [2]
 
 # Test error case - no link files found
   $ cd ..
@@ -281,8 +194,7 @@
    create mode 100644 README.md
 
   $ josh link fetch
-  Error: No .josh-link.toml files found
-  No .josh-link.toml files found
-  [1]
+  error: unrecognized subcommand
+  [2]
 
   $ cd ..