浏览代码

http2/h2demo: remove h2demo build constraint

The build constraint is no longer useful. It doesn't prevent this
package contributing module requirements to x/net, that was already
resolved by carving h2demo into its own module in golang/go#30685.
Few people do go get -u golang.org/x/net/... in GOPATH mode by now,
so there's no need to optimize for avoiding polluting GOPATH/bin.

Removing the build constraint allows the package to be visible and
tested by trybots and builders. It's also simpler.

Fixes golang/go#34361

Change-Id: I84b5d70aab210ca8e4f5494160ae4d9049ef08ad
Reviewed-on: https://go-review.googlesource.com/c/net/+/196036
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Dmitri Shuralyov 6 年之前
父节点
当前提交
a8b05e9114
共有 3 个文件被更改,包括 1 次插入5 次删除
  1. 1 1
      http2/h2demo/Dockerfile
  2. 0 2
      http2/h2demo/h2demo.go
  3. 0 2
      http2/h2demo/tmpl.go

+ 1 - 1
http2/h2demo/Dockerfile

@@ -25,7 +25,7 @@ COPY . /go/src/golang.org/x/net
 
 # Install binary to /go/bin:
 WORKDIR /go/src/golang.org/x/net/http2/h2demo
-RUN go install -tags "h2demo netgo"
+RUN go install -tags "netgo"
 
 
 FROM debian:stretch

+ 0 - 2
http2/h2demo/h2demo.go

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build h2demo
-
 package main
 
 import (

+ 0 - 2
http2/h2demo/tmpl.go

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build h2demo
-
 package main
 
 import "html/template"