From 3d40b6f99a7db5579e95778b9f2032cc50e9bba2 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Wed, 5 Aug 2020 20:24:20 -0500 Subject: [PATCH] [nostalgia] Update Jenkinsfiles for vcpkg --- jenkins/gba/Jenkinsfile | 4 +--- jenkins/linux/Jenkinsfile | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/jenkins/gba/Jenkinsfile b/jenkins/gba/Jenkinsfile index 4be5856b..0f178b39 100644 --- a/jenkins/gba/Jenkinsfile +++ b/jenkins/gba/Jenkinsfile @@ -9,9 +9,7 @@ pipeline { stages { stage('Environment') { steps { - sh 'conan profile update settings.compiler.libcxx=libstdc++11 default' - sh 'conan remote add -f bincrafters https://api.bintray.com/conan/bincrafters/public-conan' - sh 'make conan' + sh 'make vcpkg' } } stage('Build Tools Debug') { diff --git a/jenkins/linux/Jenkinsfile b/jenkins/linux/Jenkinsfile index f9ea1703..614210b5 100644 --- a/jenkins/linux/Jenkinsfile +++ b/jenkins/linux/Jenkinsfile @@ -5,8 +5,7 @@ pipeline { stages { stage('Environment') { steps { - sh 'make setup-conan' - sh 'make conan' + sh 'make vcpkg' } } stage('Build Asan') {