fix: only consider commits that are part of the build

Author: christophwitzko

cmd/semantic-release/main.go

@@ -96,6 +96,9 @@ func main() {
 		defaultBranch = "*"
 	}
 
+	currentSha := condition.GetCurrentSHA()
+	logger.Println("found current sha: " + currentSha)
+
 	if !*noci {
 		logger.Println("running CI condition...")
 		exitIfError(condition.Travis(*token, defaultBranch, isPrivate))
@@ -111,7 +114,7 @@ func main() {
 	}
 
 	logger.Println("getting commits...")
-	commits, err := repo.GetCommits(currentBranch)
+	commits, err := repo.GetCommits(currentSha)
 	exitIfError(err)
 
 	logger.Println("calculating new version...")
@@ -132,7 +135,7 @@ func main() {
 	}
 
 	logger.Println("creating release...")
-	exitIfError(repo.CreateRelease(changelog, newVer, currentBranch))
+	exitIfError(repo.CreateRelease(changelog, newVer, currentBranch, currentSha))
 
 	if *ghr {
 		exitIfError(ioutil.WriteFile(".ghr", []byte(fmt.Sprintf("-u %s -r %s v%s", repo.Owner, repo.Repo, newVer.String())), 0644))

condition/condition.go

@@ -20,3 +20,11 @@ func GetCurrentBranch() string {
 	}
 	return readGitHead()
 }
+
+func GetCurrentSHA() string {
+	if val := os.Getenv("TRAVIS_COMMIT"); val != "" {
+		return val
+	}
+	// TODO: resolve ref
+	return GetCurrentBranch()
+}

semrel.go

@@ -98,9 +98,9 @@ func parseCommit(commit *github.RepositoryCommit) *Commit {
 	return c
 }
 
-func (repo *Repository) GetCommits(branch string) ([]*Commit, error) {
+func (repo *Repository) GetCommits(sha string) ([]*Commit, error) {
 	opts := &github.CommitsListOptions{
-		SHA:         branch,
+		SHA:         sha,
 		ListOptions: github.ListOptions{PerPage: 100},
 	}
 	commits, _, err := repo.Client.Repositories.ListCommits(repo.Ctx, repo.Owner, repo.Repo, opts)
@@ -181,9 +181,22 @@ func (repo *Repository) GetLatestRelease(vrange string) (*Release, error) {
 	return &Release{lastRelease.SHA, &npver}, nil
 }
 
-func (repo *Repository) CreateRelease(changelog string, newVersion *semver.Version, branch string) error {
+func (repo *Repository) CreateRelease(changelog string, newVersion *semver.Version, branch, sha string) error {
 	tag := fmt.Sprintf("v%s", newVersion.String())
 	hasPrerelease := newVersion.Prerelease() != ""
+
+	if branch != sha {
+		ref := "refs/tags/" + tag
+		tagOpts := &github.Reference{
+			Ref:    &ref,
+			Object: &github.GitObject{SHA: &sha},
+		}
+		_, _, err := repo.Client.Git.CreateRef(repo.Ctx, repo.Owner, repo.Repo, tagOpts)
+		if err != nil {
+			return err
+		}
+	}
+
 	opts := &github.RepositoryRelease{
 		TagName:         &tag,
 		Name:            &tag,

semrel_test.go

@@ -69,6 +69,17 @@ func githubHandler(w http.ResponseWriter, r *http.Request) {
 		json.NewEncoder(w).Encode(GITHUB_TAGS)
 		return
 	}
+	if r.Method == "POST" && r.URL.Path == "/repos/owner/test-repo/git/refs" {
+		var data map[string]string
+		json.NewDecoder(r.Body).Decode(&data)
+		r.Body.Close()
+		if data["sha"] != "deadbeef" || data["ref"] != "refs/tags/v2.0.0" {
+			http.Error(w, "invalid sha or ref", http.StatusBadRequest)
+			return
+		}
+		fmt.Fprint(w, "{}")
+		return
+	}
 	if r.Method == "POST" && r.URL.Path == "/repos/owner/test-repo/releases" {
 		var data map[string]string
 		json.NewDecoder(r.Body).Decode(&data)
@@ -176,7 +187,7 @@ func TestCreateRelease(t *testing.T) {
 	repo, ts := getNewTestRepo(t)
 	defer ts.Close()
 	newVersion, _ := semver.NewVersion("2.0.0")
-	err := repo.CreateRelease("", newVersion, "")
+	err := repo.CreateRelease("", newVersion, "", "deadbeef")
 	if err != nil {
 		t.Fatal(err)
 	}