From 2f298f84e55fb90946d36cfd9d21e142038d9915 Mon Sep 17 00:00:00 2001 From: kieran-kohtz <89012045+kieran-kohtz@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:15:00 +0000 Subject: [PATCH 1/4] Updated jenkins shared library version to v0.18.0 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 61fd5394..76de12f2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('xmos_jenkins_shared_library@v0.16.2') _ +@Library('xmos_jenkins_shared_library@v0.18.0') _ getApproval() From 99e61b0cd92cf35a21c557117a9a84dc380b4854 Mon Sep 17 00:00:00 2001 From: kieran-kohtz <89012045+kieran-kohtz@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:15:01 +0000 Subject: [PATCH 2/4] Removed Brew Labels --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 76de12f2..ffbeb8a6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { stages { stage('Basic tests') { agent { - label 'x86_64&&brew' + label 'x86_64' } stages { stage('Get view') { @@ -113,7 +113,7 @@ pipeline { parallel { stage('Build Linux host app') { agent { - label 'x86_64&&brew&&linux' + label 'x86_64&&linux' } steps { xcorePrepareSandbox("${VIEW}", "${REPO}") @@ -129,7 +129,7 @@ pipeline { } stage('Build Mac host app') { agent { - label 'x86_64&&brew&&macOS' + label 'x86_64&&macOS' } steps { xcorePrepareSandbox("${VIEW}", "${REPO}") @@ -183,7 +183,7 @@ pipeline { } stage('Update') { agent { - label 'x86_64&&brew' + label 'x86_64' } steps { updateViewfiles() From 2ba4c37363c77dda3135a191173a7a177d5fcba8 Mon Sep 17 00:00:00 2001 From: kieran-kohtz <89012045+kieran-kohtz@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:15:02 +0000 Subject: [PATCH 3/4] Removed Brewfile --- Brewfile | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Brewfile diff --git a/Brewfile b/Brewfile deleted file mode 100644 index 2fd6d0b8..00000000 --- a/Brewfile +++ /dev/null @@ -1,7 +0,0 @@ -tap 'homebrew/core' - -brew 'perl' -brew 'cpanm' - -brew 'python@2' -brew 'pipenv' From c09e51545526ff19a070123745e5a78419dacb5f Mon Sep 17 00:00:00 2001 From: kieran-kohtz <89012045+kieran-kohtz@users.noreply.github.com> Date: Wed, 9 Mar 2022 13:48:59 +0000 Subject: [PATCH 4/4] Update jenkins labels --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ffbeb8a6..04781502 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { stages { stage('Basic tests') { agent { - label 'x86_64' + label 'x86_64 && linux' } stages { stage('Get view') { @@ -183,7 +183,7 @@ pipeline { } stage('Update') { agent { - label 'x86_64' + label 'x86_64 && linux' } steps { updateViewfiles()