Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 05:17:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #561 from birarda/jenkins

Browse source 
fix broken push triggers for generated jobs
This commit is contained in:
Leonardo Murillo 2013-06-19 14:56:26 -07:00
commit e4f1dd3116
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
jenkins/jobs.groovy
View file

@ -1,6 +1,7 @@
def hifiJob(String targetName, Boolean deploy) { def hifiJob(String targetName, Boolean deploy) {
def JENKINS_URL = 'https://jenkins.below92.com/' def JENKINS_URL = 'https://jenkins.below92.com/'
def GITHUB_HOOK_URL = 'https://github.com/worklist/hifi/' def GITHUB_HOOK_URL = 'https://github.com/worklist/hifi/'
def GIT_REPO_URL = 'git@github.com:worklist/hifi.git'
def HIPCHAT_ROOM = 'High Fidelity' def HIPCHAT_ROOM = 'High Fidelity'
job { job {
@ -8,8 +9,10 @@ def hifiJob(String targetName, Boolean deploy) {
logRotator(7, -1, -1, -1) logRotator(7, -1, -1, -1)
scm { scm {
git(GITHUB_HOOK_URL, 'master') { node -> git(GIT_REPO_URL, 'master') { node ->
node << includedRegions << "${targetName}/.*\nlibraries/.*" node / includedRegions << "${targetName}/.*\nlibraries/.*"
node / 'userRemoteConfigs' / 'hudson.plugins.git.UserRemoteConfig' / 'name' << ''
node / 'userRemoteConfigs' / 'hudson.plugins.git.UserRemoteConfig' / 'refspec' << ''
} }
} }
@ -89,25 +92,24 @@ def hifiJob(String targetName, Boolean deploy) {
} }
} }
def deployTargets = [ def targets = [
'animation-server', 'animation-server':true,
'audio-mixer', 'audio-mixer':true,
'avatar-mixer', 'avatar-mixer':true,
'domain-server', 'domain-server':true,
'eve', 'eve':true,
'pairing-server', 'pairing-server':true,
'space-server', 'space-server':true,
'voxel-server' 'voxel-server':true,
'interface':false,
'dummy-job':false
] ]
/* setup all of the deploys jobs that use the above template */ /* setup all of the target jobs to use the above template */
deployTargets.each { for (target in targets) {
hifiJob(it, true) queue hifiJob(target.key, target.value)
} }
/* setup the interface job, doesn't deploy */
hifiJob('interface', false)
/* setup the parametrized-build job for builds from jenkins */ /* setup the parametrized-build job for builds from jenkins */
parameterizedJob = hifiJob('$TARGET', true) parameterizedJob = hifiJob('$TARGET', true)
parameterizedJob.with { parameterizedJob.with {

2
libraries/shared/src/OctalCode.cpp
View file

@ -3,7 +3,7 @@
// hifi // hifi
// //
// Created by Stephen Birarda on 3/15/13. // Created by Stephen Birarda on 3/15/13.
// // Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
// //
#include <cmath> #include <cmath>