Revert "Rename go.yml to .github/workflows/go.yml (#14)"

This reverts commit f126f655867778806cdadfe092d3ee50ecb51c97.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>

cmd/tmpfs/tmpfs.go

@@ -8,9 +8,9 @@ import (
 	"os"
 	"sync"
 
-	"harvey-os.org/ninep/protocol"
-	"harvey-os.org/ninep/tmpfs"
-	"harvey-os.org/sys"
+	"harvey-os.org/internal/tmpfs"
+	"harvey-os.org/pkg/ninep/protocol"
+	"harvey-os.org/pkg/sys"
 )
 
 var (

cmd/tmpfs/tmpfs_test.go

@@ -8,7 +8,7 @@ import (
 	"log"
 	"testing"
 
-	"harvey-os.org/ninep/tmpfs"
+	"harvey-os.org/internal/tmpfs"
 )
 
 // Lots of tests shamelessly lifted from the ninep/ufs code

cmd/tmpfs/tmpfs_test_plan9.go

@@ -7,9 +7,9 @@ import (
 	"os"
 	"testing"
 
-	"harvey-os.org/ninep/protocol"
-	"harvey-os.org/ninep/tmpfs"
-	"harvey-os.org/sys"
+	"harvey-os.org/internal/tmpfs"
+	"harvey-os.org/pkg/ninep/protocol"
+	"harvey-os.org/pkg/sys"
 )
 
 func TestNwTmpfs(t *testing.T) {

cmd/ufs/ufs.go

@@ -9,8 +9,8 @@ import (
 	"log"
 	"net"
 
-	"harvey-os.org/ninep/protocol"
-	"harvey-os.org/ninep/ufs"
+	"harvey-os.org/internal/ufs"
+	"harvey-os.org/pkg/ninep/protocol"
 )
 
 var (

ninep/tmpfs/archive.go → internal/tmpfs/archive.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"harvey-os.org/ninep/protocol"
+	"harvey-os.org/pkg/ninep/protocol"
 )
 
 // Archive contains the directories and files from a decompressed archive

ninep/tmpfs/archive_test.go → internal/tmpfs/archive_test.go

@@ -65,10 +65,7 @@ func createTestImage() *bytes.Buffer {
 }
 
 func TestReadArchive(t *testing.T) {
-	arch, err := ReadImage(createTestImage())
-	if err != nil {
-		t.Fatal(err)
-	}
+	arch := ReadImage(createTestImage())
 
 	// Read root
 	root := arch.Root()

ninep/ufs/filesystem.go → internal/ufs/filesystem.go

@@ -15,8 +15,8 @@ import (
 	"sync"
 	"time"
 
-	"harvey-os.org/ninep"
-	"harvey-os.org/ninep/protocol"
+	"harvey-os.org/pkg/ninep"
+	"harvey-os.org/pkg/ninep/protocol"
 )
 
 type file struct {

ninep/ufs/filesystem_test.go → internal/ufs/filesystem_test.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"harvey-os.org/ninep/protocol"
+	"harvey-os.org/pkg/ninep/protocol"
 )
 
 func print(f string, args ...interface{}) {
@@ -79,7 +79,7 @@ func TestMount(t *testing.T) {
 	}
 	t.Logf("Client is %v", c.String())
 
-	n, err := NewUFS("", 0, func(l *protocol.NetListener) error {
+	n, err := NewUFS("", 0, func(l *protocol.Listener) error {
 		l.Trace = print //t.Logf
 		return nil
 	})

ninep/ufs/ninep.go → internal/ufs/ninep.go

@@ -10,7 +10,7 @@ import (
 	"flag"
 	"os"
 
-	"harvey-os.org/ninep/protocol"
+	"harvey-os.org/pkg/ninep/protocol"
 )
 
 var (

ninep/ufs/ninep_unix.go → internal/ufs/ninep_unix.go

@@ -12,7 +12,7 @@ import (
 	"os"
 	"syscall"
 
-	"harvey-os.org/ninep/protocol"
+	"harvey-os.org/pkg/ninep/protocol"
 )
 
 func fileInfoToQID(d os.FileInfo) protocol.QID {

ninep/ufs/ninep_windows.go → internal/ufs/ninep_windows.go

@@ -11,7 +11,7 @@ package ufs
 import (
 	"os"
 
-	"harvey-os.org/ninep/protocol"
+	"harvey-os.org/pkg/ninep/protocol"
 )
 
 func fileInfoToQID(d os.FileInfo) protocol.QID {

ninep/debug.go → pkg/ninep/debug.go

@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"log"
 
-	"harvey-os.org/ninep/protocol"
+	"harvey-os.org/pkg/ninep/protocol"
 )
 
 type DebugFileServer struct {

ninep/protocol/gen.go → pkg/ninep/protocol/gen.go

@@ -33,7 +33,7 @@ import (
 	"text/template"
 
 	"golang.org/x/tools/imports"
-	"harvey-os.org/ninep/protocol"
+	"harvey-os.org/pkg/ninep/protocol"
 )
 
 const (

ninep/protocol/protocol_test.go → pkg/ninep/protocol/protocol_test.go

@@ -329,9 +329,9 @@ func TestTManyRPCs(t *testing.T) {
 	}
 	t.Logf("Client is %v", c.String())
 
-	s, err := NewNetListener(
+	s, err := NewListener(
 		func() NineServer { return newEcho() },
-		func(l *NetListener) error {
+		func(l *Listener) error {
 			l.Trace = print
 			return nil
 		})
@@ -368,9 +368,9 @@ func TestTMessages(t *testing.T) {
 	}
 	t.Logf("Client is %v", c.String())
 
-	s, err := NewNetListener(
+	s, err := NewListener(
 		func() NineServer { return newEcho() },
-		func(l *NetListener) error {
+		func(l *Listener) error {
 			l.Trace = print // t.Logf
 			return nil
 		})
@@ -512,7 +512,7 @@ func BenchmarkNull(b *testing.B) {
 	}
 	b.Logf("Client is %v", c.String())
 
-	s, err := NewNetListener(
+	s, err := NewListener(
 		func() NineServer {
 			return newEcho()
 		})