From 7be50ae712bf3d05c14c25b140199e9a09531dd3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 19 Jun 2013 11:40:22 -0700 Subject: [PATCH 1/3] add copyright to SimpleMovingAverage implementation --- libraries/shared/src/SimpleMovingAverage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/shared/src/SimpleMovingAverage.cpp b/libraries/shared/src/SimpleMovingAverage.cpp index db433c020f..df41433618 100644 --- a/libraries/shared/src/SimpleMovingAverage.cpp +++ b/libraries/shared/src/SimpleMovingAverage.cpp @@ -3,7 +3,7 @@ // hifi // // Created by Stephen Birarda on 4/18/13. -// +// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. // #include "SharedUtil.h" From 13c46152c3062da20168341bd9fbdc21bf80a5ab Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 19 Jun 2013 11:49:29 -0700 Subject: [PATCH 2/3] rename the seed job so it fires first, block others --- jenkins/jobs.groovy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index 273ad6c674..d40652161e 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -22,7 +22,12 @@ def hifiJob(String targetName, Boolean deploy) { 'jenkins.plugins.hipchat.HipChatNotifier_-HipChatJobProperty' { room HIPCHAT_ROOM - } + } + + 'hudson.plugins.buildblocker.BuildBlockerProperty' { + useBuildBlocker true + blockingJobs 'hifi - seed' + } } project / 'triggers' << 'com.cloudbees.jenkins.GitHubPushTrigger' { From b431657abfb973898b8c6a65fc72b1028bc3eb50 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 19 Jun 2013 12:18:38 -0700 Subject: [PATCH 3/3] fix the job block for new hifi--seed name --- jenkins/jobs.groovy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index d40652161e..8dd6df5aea 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -1,7 +1,6 @@ def hifiJob(String targetName, Boolean deploy) { def JENKINS_URL = 'https://jenkins.below92.com/' def GITHUB_HOOK_URL = 'https://github.com/worklist/hifi/' - def GIT_REPO_URL = 'git@github.com:worklist/hifi.git' def HIPCHAT_ROOM = 'High Fidelity' job { @@ -9,7 +8,7 @@ def hifiJob(String targetName, Boolean deploy) { logRotator(7, -1, -1, -1) scm { - git(GIT_REPO_URL, 'master') { node -> + git(GITHUB_HOOK_URL, 'master') { node -> node << includedRegions << "${targetName}/.*\nlibraries/.*" } } @@ -26,7 +25,7 @@ def hifiJob(String targetName, Boolean deploy) { 'hudson.plugins.buildblocker.BuildBlockerProperty' { useBuildBlocker true - blockingJobs 'hifi - seed' + blockingJobs 'hifi--seed' } }