From fb6e8efaa1fcccc977a99fb2f329c3d5ca95585f Mon Sep 17 00:00:00 2001 From: tjdeckard Date: Sun, 8 Aug 2021 11:07:32 -0400 Subject: [PATCH] Update branches in gitversion.yml and jenkinsfile Also updated .version file --- FOR_RELEASE/GameData/CommunityResourcePack/CRP.version | 8 ++++---- GitVersion.yml | 4 ++-- Jenkinsfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version index c51be2c..f31a557 100644 --- a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version +++ b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version @@ -1,6 +1,6 @@ { "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", @@ -8,9 +8,9 @@ "ALLOW_PRE_RELEASE":false }, "VERSION":{ - "MAJOR":1, - "MINOR":4, - "PATCH":2, + "MAJOR":112, + "MINOR":0, + "PATCH":0, "BUILD":0 }, "KSP_VERSION":{ diff --git a/GitVersion.yml b/GitVersion.yml index 17bc060..2fce6a6 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -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: {} diff --git a/Jenkinsfile b/Jenkinsfile index b23d478..976fdd4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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"