From 1de96b6175d56d74f0c6323881d239bf28872caf Mon Sep 17 00:00:00 2001 From: Alexander Pavel Date: Fri, 30 Nov 2018 11:37:00 -0800 Subject: [PATCH 1/2] pkg/scaffold,version,changelog: bump to v0.2.0 --- CHANGELOG.md | 2 +- pkg/scaffold/gopkgtoml.go | 4 ++-- pkg/scaffold/gopkgtoml_test.go | 4 ++-- version/version.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcf5d01c4ba..60920a265ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Unreleased +## v0.2.0 ### Changed diff --git a/pkg/scaffold/gopkgtoml.go b/pkg/scaffold/gopkgtoml.go index b3890846d9b..5a9f0c9e33e 100644 --- a/pkg/scaffold/gopkgtoml.go +++ b/pkg/scaffold/gopkgtoml.go @@ -85,8 +85,8 @@ required = [ [[constraint]] name = "github.com/operator-framework/operator-sdk" # The version rule is used for a specific release and the master branch for in between releases. - branch = "master" #osdk_branch_annotation - # version = "=v0.1.1" #osdk_version_annotation + # branch = "master" #osdk_branch_annotation + version = "=v0.2.0" #osdk_version_annotation [prune] go-tests = true diff --git a/pkg/scaffold/gopkgtoml_test.go b/pkg/scaffold/gopkgtoml_test.go index ec78d238d09..e064f4f6b1e 100644 --- a/pkg/scaffold/gopkgtoml_test.go +++ b/pkg/scaffold/gopkgtoml_test.go @@ -77,8 +77,8 @@ required = [ [[constraint]] name = "github.com/operator-framework/operator-sdk" # The version rule is used for a specific release and the master branch for in between releases. - branch = "master" #osdk_branch_annotation - # version = "=v0.1.1" #osdk_version_annotation + # branch = "master" #osdk_branch_annotation + version = "=v0.2.0" #osdk_version_annotation [prune] go-tests = true diff --git a/version/version.go b/version/version.go index 7ad80a6404e..44fe2bd724f 100644 --- a/version/version.go +++ b/version/version.go @@ -15,5 +15,5 @@ package version var ( - Version = "v0.1.1+git" + Version = "v0.2.0" ) From 77efb3943bc653ca9407e74d1f72318323560475 Mon Sep 17 00:00:00 2001 From: Alexander Pavel Date: Fri, 30 Nov 2018 11:42:13 -0800 Subject: [PATCH 2/2] pkg/scaffold: change branch in gopkg to v0.2.x --- pkg/scaffold/gopkgtoml.go | 2 +- pkg/scaffold/gopkgtoml_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/scaffold/gopkgtoml.go b/pkg/scaffold/gopkgtoml.go index 5a9f0c9e33e..d7a038eeb80 100644 --- a/pkg/scaffold/gopkgtoml.go +++ b/pkg/scaffold/gopkgtoml.go @@ -85,7 +85,7 @@ required = [ [[constraint]] name = "github.com/operator-framework/operator-sdk" # The version rule is used for a specific release and the master branch for in between releases. - # branch = "master" #osdk_branch_annotation + # branch = "v0.2.x" #osdk_branch_annotation version = "=v0.2.0" #osdk_version_annotation [prune] diff --git a/pkg/scaffold/gopkgtoml_test.go b/pkg/scaffold/gopkgtoml_test.go index e064f4f6b1e..1d3355ff8ae 100644 --- a/pkg/scaffold/gopkgtoml_test.go +++ b/pkg/scaffold/gopkgtoml_test.go @@ -77,7 +77,7 @@ required = [ [[constraint]] name = "github.com/operator-framework/operator-sdk" # The version rule is used for a specific release and the master branch for in between releases. - # branch = "master" #osdk_branch_annotation + # branch = "v0.2.x" #osdk_branch_annotation version = "=v0.2.0" #osdk_version_annotation [prune]