diff --git a/cmd/reproxytool/BUILD.bazel b/cmd/reproxytool/BUILD.bazel index 31e973b0..1499b433 100644 --- a/cmd/reproxytool/BUILD.bazel +++ b/cmd/reproxytool/BUILD.bazel @@ -20,7 +20,6 @@ go_binary( embed = [":reproxytool_lib"], target_compatible_with = select({ "@platforms//os:linux": [], - "@platforms//os:windows": [], "//conditions:default": ["@platforms//:incompatible"], }), visibility = ["//visibility:public"], diff --git a/internal/pkg/logrecordserver/logrecordserver.go b/internal/pkg/logrecordserver/logrecordserver.go index 4d0dc561..ae1bfb63 100644 --- a/internal/pkg/logrecordserver/logrecordserver.go +++ b/internal/pkg/logrecordserver/logrecordserver.go @@ -20,7 +20,6 @@ import ( "encoding/json" "io/fs" "net/http" - "path/filepath" "sync" "github.com/bazelbuild/reclient/internal/pkg/logger" @@ -128,9 +127,8 @@ func (lr *Server) Start(listenAddr string) { if err != nil { log.Fatal(err) } - basePath := filepath.Join("internal", "pkg", "logrecordserver", "ui", "app", "dist", "reproxyui", "browser") log.V(1).Infof("Loaded JS app from embedded tar file (size=%v)", len(tarAngularApp)) - indexFS, _ := fs.Sub(tarfs, basePath) + indexFS, _ := fs.Sub(tarfs, "internal/pkg/logrecordserver/ui/app/dist/reproxyui/browser") fs := http.FileServer(http.FS(indexFS)) r.PathPrefix("/").Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { fs.ServeHTTP(w, r) diff --git a/internal/pkg/logrecordserver/ui/BUILD.bazel b/internal/pkg/logrecordserver/ui/BUILD.bazel index 3f424a5a..7356b1af 100644 --- a/internal/pkg/logrecordserver/ui/BUILD.bazel +++ b/internal/pkg/logrecordserver/ui/BUILD.bazel @@ -24,7 +24,6 @@ genrule( exec_properties = {"dockerNetwork": "standard"}, target_compatible_with = select({ "@platforms//os:linux": [], - "@platforms//os:windows": [], "//conditions:default": ["@platforms//:incompatible"], }), toolchains = ["@nodejs_toolchains//:resolved_toolchain"], diff --git a/internal/pkg/tarfs/tarfs.go b/internal/pkg/tarfs/tarfs.go index f092dc08..4da8de00 100644 --- a/internal/pkg/tarfs/tarfs.go +++ b/internal/pkg/tarfs/tarfs.go @@ -25,8 +25,6 @@ import ( "io/fs" "os" "path/filepath" - "runtime" - "strings" "time" log "github.com/golang/glog" @@ -43,14 +41,10 @@ type TarFS struct { // Open creates a new open file. func (t *TarFS) Open(name string) (fs.File, error) { - if runtime.GOOS == "windows" { - name = strings.ReplaceAll(name, "/", "\\") - } log.V(3).Infof("TarFS.Open: %s", name) if f, ok := t.tarContents[name]; ok { return f.NewOpenFile(), nil } - log.V(3).Infof("TarFS.Open: failed to find %v, tar=%v", name, t.tarContents) return nil, fs.ErrNotExist }