From bc6a0cbcd8a86609e2473d237b396b7039210b02 Mon Sep 17 00:00:00 2001 From: oscarbailey-xmos <40995889+oscarbailey-xmos@users.noreply.github.com> Date: Fri, 8 Nov 2019 12:08:11 +0000 Subject: [PATCH 1/2] Remove upstream triggers --- Jenkinsfile | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 044d9bfe..10ed3fc0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,44 +8,6 @@ pipeline { REPO = 'lib_xua' VIEW = "${env.JOB_NAME.contains('PR-') ? REPO+'_'+env.CHANGE_TARGET : REPO+'_'+env.BRANCH_NAME}" } - triggers { - /* Trigger this Pipeline on changes to the repos dependencies - * - * If this Pipeline is running in a pull request, the triggers are set - * on the base branch the PR is set to merge in to. - * - * Otherwise the triggers are set on the branch of a matching name to the - * one this Pipeline is on. - */ - upstream( - upstreamProjects: - (env.JOB_NAME.contains('PR-') ? - "../lib_device_control/${env.CHANGE_TARGET}," + - "../lib_dsp/${env.CHANGE_TARGET}," + - "../lib_i2c/${env.CHANGE_TARGET}," + - "../lib_logging/${env.CHANGE_TARGET}," + - "../lib_mic_array/${env.CHANGE_TARGET}," + - "../lib_spdif/${env.CHANGE_TARGET}," + - "../lib_xassert/${env.CHANGE_TARGET}," + - "../lib_xud/${env.CHANGE_TARGET}," + - "../tools_released/${env.CHANGE_TARGET}," + - "../tools_xmostest/${env.CHANGE_TARGET}," + - "../xdoc_released/${env.CHANGE_TARGET}" - : - "../lib_device_control/${env.BRANCH_NAME}," + - "../lib_dsp/${env.BRANCH_NAME}," + - "../lib_i2c/${env.BRANCH_NAME}," + - "../lib_logging/${env.BRANCH_NAME}," + - "../lib_mic_array/${env.BRANCH_NAME}," + - "../lib_spdif/${env.BRANCH_NAME}," + - "../lib_xassert/${env.BRANCH_NAME}," + - "../lib_xud/${env.BRANCH_NAME}," + - "../tools_released/${env.BRANCH_NAME}," + - "../tools_xmostest/${env.BRANCH_NAME}," + - "../xdoc_released/${env.BRANCH_NAME}"), - threshold: hudson.model.Result.SUCCESS - ) - } options { skipDefaultCheckout() } From fff1568c6f78a9e2bcceca6227a9837e5810e250 Mon Sep 17 00:00:00 2001 From: mbanth Date: Thu, 19 Mar 2020 16:21:57 +0000 Subject: [PATCH 2/2] Update minimum dependency version for libraries with a higher major version --- lib_xua/module_build_info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_xua/module_build_info b/lib_xua/module_build_info index d51e4ca7..5f6cb27f 100644 --- a/lib_xua/module_build_info +++ b/lib_xua/module_build_info @@ -2,7 +2,7 @@ VERSION = 1.0.0 DEPENDENT_MODULES = lib_logging(>=3.0.0) \ lib_xassert(>=4.0.0) \ - lib_xud(>=0.2.0) \ + lib_xud(>=1.0.0) \ lib_spdif(>=4.0.0) \ lib_mic_array(>=4.0.0)