natto1784/gitea-release-resource
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #72 from antonu17/fix/no-commit_sha-for-drafts

Browse Source 
Skipping resolveTagToCommitSHA for drafts
This commit is contained in:
Alex Suraci
2018-05-23 10:44:52 -04:00
committed by GitHub
parent 8bc116bec7 ca97b263da
commit 1395b7b34c
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
in_command.go
View File

@@ -66,17 +66,19 @@ func (c *InCommand) Run(destDir string, request InRequest) (InResponse, error) {
return InResponse{}, err return InResponse{}, err
} }
commitPath := filepath.Join(destDir, "commit_sha") if foundRelease.Draft != nil && !*foundRelease.Draft {
commitSHA, err = c.resolveTagToCommitSHA(*foundRelease.TagName) commitPath := filepath.Join(destDir, "commit_sha")
if err != nil { commitSHA, err = c.resolveTagToCommitSHA(*foundRelease.TagName)
return InResponse{}, err
}
if commitSHA != "" {
err = ioutil.WriteFile(commitPath, []byte(commitSHA), 0644)
if err != nil { if err != nil {
return InResponse{}, err return InResponse{}, err
} }
if commitSHA != "" {
err = ioutil.WriteFile(commitPath, []byte(commitSHA), 0644)
if err != nil {
return InResponse{}, err
}
}
} }
if foundRelease.Body != nil && *foundRelease.Body != "" { if foundRelease.Body != nil && *foundRelease.Body != "" {

6
in_command_test.go
View File

@@ -464,7 +464,6 @@ var _ = Describe("In Command", func() {
Context("which has a tag", func() { Context("which has a tag", func() {
BeforeEach(func() { BeforeEach(func() {
githubClient.GetReleaseReturns(buildRelease(1, "v0.35.0", true), nil) githubClient.GetReleaseReturns(buildRelease(1, "v0.35.0", true), nil)
githubClient.GetRefReturns(buildTagRef("v0.35.0", "f28085a4a8f744da83411f5e09fd7b1709149eee"), nil)
inRequest.Version = &resource.Version{ID: "1"} inRequest.Version = &resource.Version{ID: "1"}
inResponse, inErr = command.Run(destDir, inRequest) inResponse, inErr = command.Run(destDir, inRequest)
@@ -484,7 +483,6 @@ var _ = Describe("In Command", func() {
resource.MetadataPair{Name: "name", Value: "release-name", URL: "http://google.com"}, resource.MetadataPair{Name: "name", Value: "release-name", URL: "http://google.com"},
resource.MetadataPair{Name: "body", Value: "*markdown*", Markdown: true}, resource.MetadataPair{Name: "body", Value: "*markdown*", Markdown: true},
resource.MetadataPair{Name: "tag", Value: "v0.35.0"}, resource.MetadataPair{Name: "tag", Value: "v0.35.0"},
resource.MetadataPair{Name: "commit_sha", Value: "f28085a4a8f744da83411f5e09fd7b1709149eee"},
resource.MetadataPair{Name: "draft", Value: "true"}, resource.MetadataPair{Name: "draft", Value: "true"},
)) ))
}) })
@@ -497,10 +495,6 @@ var _ = Describe("In Command", func() {
contents, err = ioutil.ReadFile(path.Join(destDir, "version")) contents, err = ioutil.ReadFile(path.Join(destDir, "version"))
Ω(err).ShouldNot(HaveOccurred()) Ω(err).ShouldNot(HaveOccurred())
Ω(string(contents)).Should(Equal("0.35.0")) Ω(string(contents)).Should(Equal("0.35.0"))
contents, err = ioutil.ReadFile(path.Join(destDir, "commit_sha"))
Ω(err).ShouldNot(HaveOccurred())
Ω(string(contents)).Should(Equal("f28085a4a8f744da83411f5e09fd7b1709149eee"))
}) })
}) })