Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#44 from pwittrock/toml
Browse files Browse the repository at this point in the history
Make release Gopkg.toml version match the tag of the release
  • Loading branch information
Phillip Wittrock authored Apr 3, 2018
2 parents a4ff5f4 + 384efcc commit 135624d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
10 changes: 3 additions & 7 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Uncomment to update deps with dep tool
ignored = ["github.com/kubernetes-sigs/kubebuilder","github.com/kubernetes-sigs/kubebuilder/cmd"]

# Packages required by users
required = ["github.com/kubernetes-sig-testing/frameworks/integration",
"k8s.io/client-go/plugin/pkg/client/auth",
Expand All @@ -23,10 +20,9 @@ required = ["github.com/kubernetes-sig-testing/frameworks/integration",
[prune]
go-tests = true

# Comment to update deps with dep tool
#[[constraint]]
# version = "v1.9-alpha.25"
# name = "github.com/kubernetes-sigs/kubebuilder"
[[constraint]]
version = "KUBEBUILDER_VERSION"
name = "github.com/kubernetes-sigs/kubebuilder"

[[constraint]]
name = "github.com/golang/glog"
Expand Down
1 change: 1 addition & 0 deletions build/build_vendor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ cp /workspace/LICENSE /workspace/vendor/github.com/kubernetes-sigs/kubebuilder/L

export DEST=/workspace/_output/kubebuilder/bin/
mkdir -p $DEST || echo ""
sed -i "s/KUBEBUILDER_VERSION/"${VERSION-master}"/" Gopkg.toml
tar -czvf $DEST/vendor.tar.gz vendor/ Gopkg.lock Gopkg.toml
5 changes: 0 additions & 5 deletions cmd/Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
# Uncomment to update deps with dep tool
# ignored = ["github.com/kubernetes-sigs/kubebuilder","github.com/kubernetes-sigs/kubebuilder/cmd"]

[prune]
non-go = true
go-tests = true

[[constraint]]
branch = "release-v1.9-alpha.15"
name = "github.com/kubernetes-sigs/kubebuilder"

[[constraint]]
name = "github.com/emicklei/go-restful"
revision = "ff4f55a206334ef123e4f79bbf348980da81ca46"
Expand Down

0 comments on commit 135624d

Please sign in to comment.