Skip to content

Commit

Permalink
Typo fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
proski committed Jan 29, 2019
1 parent 9cc8507 commit 9ad3eff
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ Select *Stash Pull Request Builder* then configure:

**Advanced options**
- Ignore ssl certificates:
- Build PR targetting only these branches: common separated list of branch names (or regexes). Blank for all.
- Build PR targeting only these branches: common separated list of branch names (or regexes). Blank for all.
- Rebuild if destination branch changes:
- Build only if Stash reports no conflicts: this should be set if using the merge branch to avoid issues with out of data merge branch in stash
- Build only if Stash reports no conflicts: this should be set if using the merge branch to avoid issues with out of date merge branch in stash
- Build only if PR is mergeable (note this will stop the PR being built if you have required approvers limit set >0 and the PR hasn't been approved)
- Cancel outdated jobs
- CI Skip Phrases: default: "NO TEST"
Expand All @@ -71,12 +71,12 @@ You probably also only want to build if the PR was mergeable and always without
**NOTE: *Always enable `Build only if Stash reports no conflicts` if using the merge RefSpec!*** This will make sure the lazy merge on stash has happened before the build is triggered.

#### Merging Locally
If you dont want to use the lazy merged Stash PR RefSpec (described above) the other option is to do the merge locally as part of the build using the Jenkins git plugin (these only work for branches within the same repo);
If you don't want to use the lazy merged Stash PR RefSpec (described above) the other option is to do the merge locally as part of the build using the Jenkins git plugin (these only work for branches within the same repo);

1. Select Git SCM
2. Add Repository URL as bellow
2. Add Repository URL as below
`git@myStashHost.com:${projectCode}/${repositoryName}.git`
3. In Branch Specifier, type as bellow
3. In Branch Specifier, type as below
`*/${sourceBranch}`
4. In the "Source Code Management" > "Git" > "Additional Behaviors" section, click "Add" > "Merge Before Building"
5. In "Name of Repository" put "origin" (or, if not using default name, use your remote repository's name. Note: unlike in the main part of the Git Repository config, you cannot leave this item blank for "default".)
Expand Down Expand Up @@ -121,7 +121,7 @@ If you want to add additional parameters to the triggered build, add comments us
It is possible to add a post build action that gives the option to post additional information to Stash when a build has been either successful or failed.
These comments can contain environment variables that will be translated when posted to Stash.

This feature can be used to post for instance a url to the deployed application or code coverage at a successful build and why the build failed like what tests that did not pass.
This feature can be used to post for instance a URL to the deployed application or code coverage at a successful build and why the build failed like what tests that did not pass.

## Copyright

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<f:entry title="Ignore ssl certificates" field="ignoreSsl">
<f:checkbox default="false"/>
</f:entry>
<f:entry title="Build PR targetting only these branches" field="targetBranchesToBuild">
<f:entry title="Build PR targeting only these branches" field="targetBranchesToBuild">
<f:textbox default="" />
</f:entry>
<f:entry title="Rebuild if destination branch changes" field="checkDestinationCommit">
Expand Down

0 comments on commit 9ad3eff

Please sign in to comment.