[nostalgia] Update Jenkinsfiles for vcpkg

2020-08-05 20:24:20 -05:00
parent be1a03c554
commit 3d40b6f99a
2 changed files with 2 additions and 5 deletions
--- 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') {
--- 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') {