Merge pull request #19 from kubesphere-sigs/set-commitish

Set commitish when creating a release
kubesphere-sigs · Nov 4, 2021 · b25af8c · b25af8c
2 parents 8cf4ea3 + 07491b1
commit b25af8c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
 
 jobs:
   UpdateReleaseDraft:

diff --git a/controllers/git.go b/controllers/git.go
@@ -26,7 +26,7 @@ import (
 /**
 TODO make these functions into a struct
 For example, we can share parts of the variables, such as git.Repository, secret .etc.
- */
+*/
 
 func saveAndPush(gitRepo *git.Repository, user, targetFile string, data []byte, secret *v1.Secret) (err error) {
 	if err = ioutil.WriteFile(targetFile, data, 0644); err != nil {
@@ -89,12 +89,12 @@ func release(repo devopsv1alpha1.Repository, secret *v1.Secret, user string) (er
 	case devopsv1alpha1.ActionPreRelease:
 		provider := internal_scm.GetGitProvider(string(repo.Provider), orgAndRepo, string(secret.Data[v1.BasicAuthPasswordKey]))
 		if provider != nil {
-			err = provider.Release(repo.Version, false, true)
+			err = provider.Release(repo.Version, repo.Branch, false, true)
 		}
 	case devopsv1alpha1.ActionRelease:
 		provider := internal_scm.GetGitProvider(string(repo.Provider), orgAndRepo, string(secret.Data[v1.BasicAuthPasswordKey]))
 		if provider != nil {
-			err = provider.Release(repo.Version, false, false)
+			err = provider.Release(repo.Version, repo.Branch, false, false)
 		}
 	}
 	return

diff --git a/controllers/internal_scm/factory.go b/controllers/internal_scm/factory.go
@@ -3,7 +3,7 @@ package internal_scm
 import "github.com/kubesphere-sigs/ks-releaser/api/v1alpha1"
 
 type GitReleaser interface {
-	Release(version string, draft, prerelease bool) (err error)
+	Release(version, commitish string, draft, prerelease bool) (err error)
 }
 
 // GetGitProvider returns the GitReleaser implement by kind

diff --git a/controllers/internal_scm/github.go b/controllers/internal_scm/github.go
@@ -21,12 +21,13 @@ func NewGitHub(repo, token string) *GitHub {
 	}
 }
 
-func (r *GitHub) Release(version string, draft, prerelease bool) (err error) {
+func (r *GitHub) Release(version, commitish string, draft, prerelease bool) (err error) {
 	client := r.getClient()
 
 	releaseInput := &scm.ReleaseInput{
 		Title:      version,
 		Tag:        version,
+		Commitish:  commitish,
 		Draft:      draft,
 		Prerelease: prerelease,
 	}

diff --git a/controllers/version_test.go b/controllers/version_test.go
@@ -169,4 +169,4 @@ status: {}
 			}
 		})
 	}
-}
+}
diff --git a/controllers/yaml_test.go b/controllers/yaml_test.go
@@ -19,7 +19,7 @@ func Test_updateReleaserAsYAML(t *testing.T) {
 	}{{
 		name: "normal case",
 		args: args{
-			data:     []byte(`apiVersion: devops.kubesphere.io/v1alpha1
+			data: []byte(`apiVersion: devops.kubesphere.io/v1alpha1
 kind: Releaser
 metadata:
   name: releaser-sample-1

diff --git a/main.go b/main.go
@@ -79,8 +79,8 @@ func main() {
 	}
 
 	if err = (&controllers.ReleaserReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
+		Client:      mgr.GetClient(),
+		Scheme:      mgr.GetScheme(),
 		GitCacheDir: "tmp",
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Releaser")
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       push:
         branches:
           - master
+      workflow_dispatch:
     jobs:
       UpdateReleaseDraft:
@@ Expand Down @@