Remove -tags headless build (#41)

temporalio · Dec 1, 2022 · af30771 · af30771
1 parent b642a45
commit af30771
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 107 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,9 +12,6 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        flags:
-          - ""
-          - -tags headless
     runs-on: ${{ matrix.os }}
     steps:
       - name: Print build information
@@ -30,5 +27,5 @@ jobs:
 
       - name: Test
         env:
-          CGO_ENABLED: ${{ matrix.cgo }}
-        run: go test -v ${{ matrix.flags }} ./...
+          CGO_ENABLED: 0
+        run: go test -v ./...
diff --git a/app/mtls_test.go b/app/mtls_test.go
@@ -11,14 +11,12 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
-	"runtime/debug"
 	"strconv"
 	"testing"
 	"text/template"
 	"time"
 
 	"github.com/temporalio/temporal-cli/app"
-	"github.com/temporalio/temporal-cli/server"
 	sconfig "github.com/temporalio/temporal-cli/server/config"
 	"github.com/urfave/cli/v2"
 	"go.temporal.io/api/enums/v1"
@@ -134,11 +132,6 @@ func TestMTLSConfig(t *testing.T) {
 		t.Fatalf("Bad state: %v", resp.NamespaceInfo.State)
 	}
 
-	if !isUIPresent() {
-		t.Log("headless build detected, not testing temporal-ui mTLS")
-		return
-	}
-
 	// Pretend to be a browser to invoke the UI API
 	res, err := http.Get(fmt.Sprintf("http://localhost:%d/api/v1/namespaces?", webUIPort))
 	if err != nil {
@@ -153,13 +146,3 @@ func TestMTLSConfig(t *testing.T) {
 		t.Fatalf("Unexpected response %s, with body %s", res.Status, string(body))
 	}
 }
-
-func isUIPresent() bool {
-	info, _ := debug.ReadBuildInfo()
-	for _, dep := range info.Deps {
-		if dep.Path == server.UIServerModule {
-			return true
-		}
-	}
-	return false
-}
diff --git a/cmd/temporal/ui_disabled_test.go b/cmd/temporal/ui_disabled_test.go
diff --git a/cmd/temporal/ui_test.go b/cmd/temporal/ui_test.go
diff --git a/server/ui.go b/server/ui.go
@@ -24,8 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-//go:build !headless
-
 package server
 
 // This file should be the only one to import ui-server packages.
@@ -39,10 +37,6 @@ import (
 	uiserveroptions "github.com/temporalio/ui-server/v2/server/server_options"
 )
 
-// Name of the ui-server module, used in tests to verify that it is included/excluded
-// as a dependency when building with the `headless` tag enabled.
-const UIServerModule = "github.com/temporalio/ui-server/v2"
-
 func newUIOption(frontendAddr string, uiIP string, uiPort int, configDir string) (ServerOption, error) {
 	cfg, err := NewUIConfig(
 		frontendAddr,

diff --git a/server/ui_disabled.go b/server/ui_disabled.go
diff --git a/server/ui_test.go b/server/ui_test.go
@@ -24,8 +24,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-//go:build !headless
-
 package server
 
 import (