From 3e2c2eadcce68e895cd2b44f4633e8271ff85a74 Mon Sep 17 00:00:00 2001 From: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Date: Fri, 24 Dec 2021 16:30:01 +0000 Subject: Add building MM back to Jenkinsfile (#218) * Add building MM back to Jenkinsfile * Use nproc * Revert -j$(nproc), since apparently -j is faster here --- Jenkinsfile | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8db69a1..ec9b56a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,13 +22,13 @@ pipeline { } } - // stage('Checkout mm') { - // steps{ - // dir('mm') { - // git url: 'https://github.com/zeldaret/mm.git' - // } - // } - // } + stage('Checkout mm') { + steps{ + dir('mm') { + git url: 'https://github.com/zeldaret/mm.git' + } + } + } } } @@ -51,20 +51,20 @@ pipeline { } } - // stage('Setup MM') { - // steps { - // dir('mm') { - // sh 'cp /usr/local/etc/roms/mm.us.rev1.z64 baserom.mm.us.rev1.z64' + stage('Setup MM') { + steps { + dir('mm') { + sh 'cp /usr/local/etc/roms/mm.us.rev1.z64 baserom.mm.us.rev1.z64' - // // Identical to `make setup` except for copying our newer ZAPD.out into mm - // sh 'make -C tools' - // sh 'cp ../ZAPD.out tools/ZAPD/' - // sh 'python3 tools/fixbaserom.py' - // sh 'python3 tools/extract_baserom.py' - // sh 'python3 extract_assets.py -t 4' - // } - // } - // } + // Identical to `make setup` except for copying our newer ZAPD.out into mm + sh 'make -C tools' + sh 'cp ../ZAPD.out tools/ZAPD/' + sh 'python3 tools/fixbaserom.py' + sh 'python3 tools/extract_baserom.py' + sh 'python3 extract_assets.py -t$(nproc)' + } + } + } } } @@ -78,14 +78,14 @@ pipeline { } } } - // stage('Build mm') { - // steps { - // dir('mm') { - // sh 'make -j disasm' - // sh 'make -j all' - // } - // } - // } + stage('Build mm') { + steps { + dir('mm') { + sh 'make -j disasm' + sh 'make -j all' + } + } + } } } } -- cgit v1.2.3