Fix build issues

Author: akclace

Makefile

@@ -95,7 +95,7 @@ covunit: ## Run unit tests with coverage and the race detector
 > rm -rf $(OPENRUN_HOME)/coverage/unit && mkdir -p $(OPENRUN_HOME)/coverage/unit
 > packages="$(GO_PACKAGES)"
 > cover_packages="$(GO_COVER_PACKAGES)"
-> go test -race -coverpkg "$$cover_packages" $$packages -args -test.gocoverdir="$(OPENRUN_HOME)/coverage/unit"
+> go test -race -covermode=atomic -coverpkg "$$cover_packages" $$packages -args -test.gocoverdir="$(OPENRUN_HOME)/coverage/unit"
 > go tool covdata percent -i=$(OPENRUN_HOME)/coverage/unit
 > go tool covdata textfmt -i=$(OPENRUN_HOME)/coverage/unit -o $(OPENRUN_HOME)/coverage/profile
 > go tool cover -func coverage/profile | grep '^total:'

deploy/obs/update_obs.sh

@@ -54,11 +54,13 @@ mv "$WORK/embed.go" internal/server/list_apps/embed.go
 rm -rf apps
 
 # Distro toolchains lag behind Go patch releases; the minor version is what
-# actually gates the language level, so drop the patch from the main module and
-# local module dependencies before creating vendor metadata.
+# actually gates the language level, so relax the patch to .0 in the main
+# module and local module dependencies before creating vendor metadata. The
+# .0 form (not a bare major.minor) is required: go mod vendor rejects a go.mod
+# whose go directive is not in the canonical three-part form.
 echo "==> Relaxing go.mod patch version and vendoring modules"
 for mod_file in go.mod pkg/binding/go.mod; do
-    sed -E 's/^go ([0-9]+\.[0-9]+)\.[0-9]+$/go \1/' "$mod_file" > "$mod_file.new"
+    sed -E 's/^go ([0-9]+\.[0-9]+)\.[0-9]+$/go \1.0/' "$mod_file" > "$mod_file.new"
     mv "$mod_file.new" "$mod_file"
 done
 GOTOOLCHAIN=local go mod vendor

tests/run_cli_tests.sh

@@ -197,7 +197,10 @@ else
   fi
 
   if [[ -n "$GOCOVERDIR" ]]; then
-      go build -cover ./cmd/openrun
+      # atomic, not the default set: covtest merges this binary's coverage
+      # data with the unit test data, which is atomic mode (covunit runs with
+      # -race), and covdata rejects mixed counter modes
+      go build -cover -covermode=atomic ./cmd/openrun
   else
       go build ./cmd/openrun
   fi