From 1750fa688ae43330e0a79c0c216af9c8c7c6ba3b Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sun, 28 Mar 2021 02:44:08 -0500
Subject: [PATCH] [nostalgia/jenkins] Update Jenkinsfiles for conan

---
 jenkins/gba/Jenkinsfile   | 3 ++-
 jenkins/linux/Jenkinsfile | 3 ++-
 jenkins/mac/Jenkinsfile   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jenkins/gba/Jenkinsfile b/jenkins/gba/Jenkinsfile
index 0bda9c58..49d5f693 100644
--- a/jenkins/gba/Jenkinsfile
+++ b/jenkins/gba/Jenkinsfile
@@ -6,7 +6,8 @@ pipeline {
 		stage('Environment') {
 			steps {
 				load 'jenkins/shared/env.gy'
-				sh 'make vcpkg'
+				sh 'make conan-config'
+				sh 'make conan'
 			}
 		}
 		stage('Build Tools Debug') {
diff --git a/jenkins/linux/Jenkinsfile b/jenkins/linux/Jenkinsfile
index 319a9049..3aec5c0b 100644
--- a/jenkins/linux/Jenkinsfile
+++ b/jenkins/linux/Jenkinsfile
@@ -6,7 +6,8 @@ pipeline {
 		stage('Environment') {
 			steps {
 				load 'jenkins/shared/env.gy'
-				sh 'make vcpkg'
+				sh 'make conan-config'
+				sh 'make conan'
 			}
 		}
 		stage('Build Asan') {
diff --git a/jenkins/mac/Jenkinsfile b/jenkins/mac/Jenkinsfile
index 12ce0ee4..86bb8277 100644
--- a/jenkins/mac/Jenkinsfile
+++ b/jenkins/mac/Jenkinsfile
@@ -6,7 +6,8 @@ pipeline {
 		stage('Environment') {
 			steps {
 				load 'jenkins/shared/env.gy'
-				sh 'make vcpkg'
+				sh 'make conan-config'
+				sh 'make conan'
 			}
 		}
 		stage('Build Asan') {