Browse Source

Run go command in command.bash, check version

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 2 years ago
parent
commit
45e4c74f9e
2 changed files with 21 additions and 5 deletions
  1. 3 5
      .github/workflows/harvey.yml
  2. 18 0
      build/command.bash

+ 3 - 5
.github/workflows/harvey.yml

@@ -19,17 +19,15 @@ jobs:
     - name: install source we build into the image
       run: |
         git clone --depth 1 --branch go1.16.6 https://github.com/golang/go.git
-        export GOBIN=`pwd`/amd64/go/bin
-        echo $GOBIN
-        mkdir -p $GOBIN
-        ls -R $GOBIN
         cd go/src
         GOOS=plan9 GOARCH=amd64 ./make.bash
-        ls -R $GOBIN
     - name: bootstrap and run
       env:
         ARCH: amd64
         OS: linux
       run: |
+        # ensure there is a go directory in the image
+        # not needed for long
+        mkdir -p ../go
         ~/go/bin/ufs -root .. -user glenda &
         bash command.bash # run a command

+ 18 - 0
build/command.bash

@@ -31,6 +31,24 @@ send "9fs tcp!10.0.2.2!5640 /n/harvey\n"
 expect -exact "term% "
 send "ls -l /n/harvey/\n"
 
+expect -exact "term% "
+send "ls -l /n/harvey/build\n"
+
+expect -exact "term% "
+send "ls -l /n/harvey/build/go\n"
+
+# make go available in the image
+expect -exact "term% "
+# this will make a /go appear, along with all the other stuff we don't want,
+# but hey ...
+# one option is to great build/go/go and build in there, and then bind that
+# in /n/harvey/build/go in /, in which case there will be a /go.
+send "bind -a /n/harvey/build /\n"
+expect -exact "term% "
+send "ls -l /\n"
+expect -exact "term% "
+send "ls -l /go\n"
+
 # and shut down
 expect -exact "term% "
 send "fshalt\n"