Merge pull request #32 from eksrvb/bugfix/pr-number-lenght

fixing branchname lenght + docs

Author: eksrha

docs/commands/getBuildInfos.md

@@ -39,7 +39,8 @@ Possible infos are: `patchLevel`, `pr`, `version`, `nextVersion`
 
 ```bash
 awesome-ci getBuildInfos -patchLevel feature -version 1.0.0
-# Output:
+
+#### Info output:
 Pull Request: 17
 Current release version: 1.0.0
 Patch level: feature
@@ -49,4 +50,23 @@ Possible new release version: 1.1.0
 awesome-ci getBuildInfos -patchLevel feature -version 1.0.0 -format "pr,next_version"
 # Output:
 17,1.1.0
+```
+
+### Special to github actions
+
+With a github action, all available information is always set as environment variables.
+
+```bash
+#### Setting Env variables:
+PR=17
+ORGA=eksrvb
+REPO=playground
+VERSION=0.4.4
+NEXT_VERSION=0.4.5
+
+#### Info output:
+Pull Request: 17
+Current release version: 0.4.4
+Patch level: bugfix
+Possible new release version: 0.4.5
 ```

docs/examples/github_actions.md

@@ -74,13 +74,12 @@ jobs:
         run: |
           wget https://github.com/eksrvb/awesome-ci/releases/latest/download/awesome-ci
           chmod +x awesome-ci
-      - name: get next Version for project build
-        id: version_step
-        run: echo "::set-output name=new_version::$(./awesome-ci getBuildInfos -format version)"
+      - name: set environment variables
+        run: awesome-ci getBuildInfos
         env:
           GITHUB_TOKEN: $\{\{ secrets.GITHUB_TOKEN \}\}
       - name: Build and write version to binary
-        run: go build -v -ldflags "-X main.version=${{ steps.version_step.outputs.new_version }}"
+        run: go build -v -ldflags "-X main.version=$NEXT_VERSION"
       - name: Create Release and upload
         run: ./awesome-ci createRelease -uploadArtifacts file=my-compiled-binary
         env:

gitOnlineController/github.go

@@ -15,7 +15,7 @@ import (
 )
 
 func github_getPrNumberForBranch(branch string) int {
-	url := fmt.Sprintf("%srepos/%s/pulls?state=open&head=%s", CiEnvironment.GitInfos.ApiUrl, CiEnvironment.GitInfos.FullRepo, branch[:len(branch)-1])
+	url := fmt.Sprintf("%srepos/%s/pulls?state=open&head=%s", CiEnvironment.GitInfos.ApiUrl, CiEnvironment.GitInfos.FullRepo, branch)
 	respBytes := newGitHubGetRequestUnmapped(url)
 	var result []models.GithubReposRepoPull
 

service/getBuildInfos.go

@@ -12,11 +12,12 @@ import (
 func GetBuildInfos(cienv string, overrideVersion *string, getVersionIncrease *string, format *string) {
 
 	var infosMergeMessage infosMergeMessage
+	var branchName = getCurrentBranchName()
 	//if cienv == "Github" {
 	//	var err error
 	infosMergeMessage, err := getLatestCommitMessage()
 	if err != nil {
-		infosMergeMessage.PRNumber = fmt.Sprint(gitOnlineController.GetPrNumberForBranch(getCurrentBranchName()))
+		infosMergeMessage.PRNumber = fmt.Sprint(gitOnlineController.GetPrNumberForBranch(branchName))
 	}
 	//}
 
@@ -25,18 +26,21 @@ func GetBuildInfos(cienv string, overrideVersion *string, getVersionIncrease *st
 		patchLevel = *getVersionIncrease
 	} else {
 		patchLevel = infosMergeMessage.PatchLevel
+		if patchLevel == "" {
+			i := strings.Index(branchName, "/")
+			patchLevel = branchName[:i]
+		}
 	}
 
 	var gitVersion string
-	var nextVersion string
 	if strings.Contains(*format, "version") || *format == "" {
 		if *overrideVersion != "" {
 			gitVersion = *overrideVersion
 		} else {
 			gitVersion = gitOnlineController.GetLatestReleaseVersion()
 		}
-		nextVersion = increaseSemVer(patchLevel, gitVersion)
 	}
+	nextVersion := increaseSemVer(patchLevel, gitVersion)
 
 	var envs []string
 	envs = append(envs, fmt.Sprintf("PR=%s", infosMergeMessage.PRNumber))
@@ -71,7 +75,7 @@ func GetBuildInfos(cienv string, overrideVersion *string, getVersionIncrease *st
 
 func getLatestCommitMessage() (infos infosMergeMessage, err error) {
 	// Output: []string {FullString, PR, FullBranch, Orga, branch, branchBegin, restOfBranch}
-	regex := `[a-zA-z ]+#([0-9]+) from (([0-9a-zA-Z-]+)/(([0-9a-z\-]+)/(.+)))`
+	regex := `[a-zA-z ]+#([0-9]+) from (([0-9a-zA-Z\-]+)/(([0-9a-z\-]+)/(.+)))`
 	r := regexp.MustCompile(regex)
 
 	// mergeMessage := r.FindStringSubmatch(`Merge pull request #3 from test-orga/feature/test-1`)
@@ -92,5 +96,6 @@ func getDefaultBranch() string {
 }
 
 func getCurrentBranchName() string {
-	return runcmd(`git branch --show-current`, true)
+	branchName := runcmd(`git branch --show-current`, true)
+	return strings.ReplaceAll(branchName, "\n", "")
 }