From 6adb92fea62c4f5bf491ce57c09b3d5525ccdf62 Mon Sep 17 00:00:00 2001 From: anurse Date: Fri, 30 Jan 2015 13:43:55 -0800 Subject: [PATCH 1/3] :arrow_up: kvm --- build/kvm.ps1 | 2 +- build/kvm.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/kvm.ps1 b/build/kvm.ps1 index fb1f8f12ab..72a0b80d78 100644 --- a/build/kvm.ps1 +++ b/build/kvm.ps1 @@ -23,7 +23,7 @@ param( ) # Constants -Set-Variable -Option Constant "BuildNumber" "10308" +Set-Variable -Option Constant "BuildNumber" "10318" Set-Variable -Option Constant "RuntimePackageName" "kre" Set-Variable -Option Constant "RuntimeFriendlyName" "K Runtime" Set-Variable -Option Constant "RuntimeShortName" "KRE" diff --git a/build/kvm.sh b/build/kvm.sh index 4b654f4f60..a746e147e3 100644 --- a/build/kvm.sh +++ b/build/kvm.sh @@ -2,14 +2,14 @@ # Source this file from your .bash-profile or script to use # "Constants" -_KVM_BUILDNUMBER="10308" +_KVM_BUILDNUMBER="10318" _KVM_RUNTIME_PACKAGE_NAME="kre" _KVM_RUNTIME_FRIENDLY_NAME="K Runtime" _KVM_RUNTIME_SHORT_NAME="KRE" _KVM_RUNTIME_FOLDER_NAME=".k" _KVM_COMMAND_NAME="kvm" _KVM_VERSION_MANAGER_NAME="K Version Manager" -_KVM_DEFAULT_FEED="https://www.myget.org/F/aspnetvnext/api/v2" +_KVM_DEFAULT_FEED="https://www.myget.org/F/aspnetrelease/api/v2" _KVM_HOME_VAR_NAME="KRE_HOME" __kvm_has() { @@ -22,14 +22,14 @@ if __kvm_has "unsetopt"; then fi if [ -z "$KVM_USER_HOME" ]; then - eval KVM_USER_HOME="~/$K_DIR_NAME" + eval KVM_USER_HOME="~/$_KVM_RUNTIME_FOLDER_NAME" fi _KVM_USER_PACKAGES="$KVM_USER_HOME/runtimes" _KVM_ALIAS_DIR="$KVM_USER_HOME/alias" if [ -z "$KRE_FEED" ]; then - KRE_FEED="https://www.myget.org/F/aspnetvnext/api/v2" + KRE_FEED="$_KVM_DEFAULT_FEED" fi __kvm_find_latest() { From da5a292b12baabe1cee06079de593ffc56b56607 Mon Sep 17 00:00:00 2001 From: anurse Date: Fri, 30 Jan 2015 14:36:45 -0800 Subject: [PATCH 2/3] :arrow_up: kvm again --- build/kvm.ps1 | 4 ++-- build/kvm.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/kvm.ps1 b/build/kvm.ps1 index 72a0b80d78..0bc2fa90ed 100644 --- a/build/kvm.ps1 +++ b/build/kvm.ps1 @@ -23,14 +23,14 @@ param( ) # Constants -Set-Variable -Option Constant "BuildNumber" "10318" +Set-Variable -Option Constant "BuildNumber" "10319" Set-Variable -Option Constant "RuntimePackageName" "kre" Set-Variable -Option Constant "RuntimeFriendlyName" "K Runtime" Set-Variable -Option Constant "RuntimeShortName" "KRE" Set-Variable -Option Constant "RuntimeFolderName" ".k" Set-Variable -Option Constant "CommandName" "kvm" Set-Variable -Option Constant "VersionManagerName" "K Version Manager" -Set-Variable -Option Constant "DefaultFeed" "https://www.myget.org/F/aspnetvnext/api/v2" +Set-Variable -Option Constant "DefaultFeed" "https://www.myget.org/F/aspnetrelease/api/v2" Set-Variable -Option Constant "CrossGenCommand" "k-crossgen" Set-Variable -Option Constant "HomeEnvVar" "KRE_HOME" Set-Variable -Option Constant "UserHomeEnvVar" "KRE_USER_HOME" diff --git a/build/kvm.sh b/build/kvm.sh index a746e147e3..bf770d07ca 100644 --- a/build/kvm.sh +++ b/build/kvm.sh @@ -2,7 +2,7 @@ # Source this file from your .bash-profile or script to use # "Constants" -_KVM_BUILDNUMBER="10318" +_KVM_BUILDNUMBER="10319" _KVM_RUNTIME_PACKAGE_NAME="kre" _KVM_RUNTIME_FRIENDLY_NAME="K Runtime" _KVM_RUNTIME_SHORT_NAME="KRE" From afb8f51d197a5597e3eb1485da53e6458d02eb6c Mon Sep 17 00:00:00 2001 From: Victor Hurdugaci Date: Tue, 3 Feb 2015 10:27:17 -0800 Subject: [PATCH 3/3] Environment variable to specify the build branch --- makefile.shade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/makefile.shade b/makefile.shade index 3f28116974..babb18b2db 100644 --- a/makefile.shade +++ b/makefile.shade @@ -13,6 +13,7 @@ use import="BuildEnv" functions @{ + static string BUILD_BRANCH = Environment.GetEnvironmentVariable("BUILD_BRANCH") ?? "dev"; static string BASE_DIR = Directory.GetCurrentDirectory(); static string TARGET_DIR = Path.Combine(BASE_DIR, "artifacts", "build"); string[] repos = new[] { @@ -424,7 +425,7 @@ functions if(Directory.Exists(repo)) { - GitPull(repoUrl, "dev", repo); + GitPull(repoUrl, BUILD_BRANCH, repo); } else { @@ -438,7 +439,7 @@ functions try { - GitClone(repoUrl, "dev"); + GitClone(repoUrl, BUILD_BRANCH); } catch (Exception ex) {