Merge pull request #6 from yokomotod/fix-none-mr

fix strconv.Atoi parsing error when no MR
hirosassa · May 6, 2022 · d80c4b0 · d80c4b0
2 parents dc87ae0 + 8a08d68
commit d80c4b0
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/pkg/platform/ci.go b/pkg/platform/ci.go
@@ -33,8 +33,7 @@ func complementWithCIEnv(ci *config.CI) error {
 		ci.SHA = os.Getenv("CI_COMMIT_SHA")
 	}
 
-	if ci.MRNumber <= 0 {
-		mr := os.Getenv("CI_MERGE_REQUEST_IID")
+	if mr := os.Getenv("CI_MERGE_REQUEST_IID"); mr != "" && ci.MRNumber <= 0 {
 		a, err := strconv.Atoi(mr)
 		if err != nil {
 			return fmt.Errorf("parse CI_MERGE_REQUEST_IID %s: %w", mr, err)