Skip to content

Commit

Permalink
Update branches in gitversion.yml and jenkinsfile
Browse files Browse the repository at this point in the history
Also updated .version file
  • Loading branch information
tjdeckard committed Aug 8, 2021
1 parent 5a7c49d commit fb6e8ef
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"NAME":"Community Resource Pack",
"URL":"https://raw.githubusercontent.com/UmbraSpaceIndustries/CommunityResourcePack/master/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version",
"URL":"https://raw.githubusercontent.com/UmbraSpaceIndustries/CommunityResourcePack/main/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version",
"DOWNLOAD":"https://github.com/UmbraSpaceIndustries/CommunityResourcePack/releases",
"GITHUB":{
"USERNAME":"UmbraSpaceIndustries",
"REPOSITORY":"CommunityResourcePack",
"ALLOW_PRE_RELEASE":false
},
"VERSION":{
"MAJOR":1,
"MINOR":4,
"PATCH":2,
"MAJOR":112,
"MINOR":0,
"PATCH":0,
"BUILD":0
},
"KSP_VERSION":{
Expand Down
4 changes: 2 additions & 2 deletions GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ branches:
develop:
increment: Patch
mode: ContinuousDelivery
regex: ^DEVELOP$
regex: ^main$
tag: bleeding-edge
main:
regex: ^master$
regex: ^release$
ignore:
sha: []
merge-message-formats: {}
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pipeline {
}
// Determine build & publish flags for branch
stage("Setup bleeding edge environment") {
when { branch "DEVELOP" }
when { branch "main" }
steps {
script {
env.ARTIFACT_CACHES = "bleeding-edge"
Expand Down

0 comments on commit fb6e8ef

Please sign in to comment.