From 92180a52eee8a880c19ac160f0e5350848a58b0c Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Mon, 21 Aug 2023 05:09:17 +0100 Subject: [PATCH] Build shift US on Jenkins (#1113) * build shift us on jenkins * fix * fix for real this time * if sbn dir exists, dont exit --- Jenkinsfile | 6 ++++++ tools/splat_ext/pm_sbn.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d3b5c212e2..256e17e419 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -112,6 +112,12 @@ pipeline { sh 'cat reports/warnings.txt > /var/www/papermar.io/html/reports/warnings.txt' } } + stage('Build (shift US)') { + steps { + sh './configure --shift us' + sh 'ninja' + } + } } post { always { diff --git a/tools/splat_ext/pm_sbn.py b/tools/splat_ext/pm_sbn.py index 385b4e8d8f..665db01825 100644 --- a/tools/splat_ext/pm_sbn.py +++ b/tools/splat_ext/pm_sbn.py @@ -540,7 +540,7 @@ if splat_loaded: data = rom_bytes[self.rom_start : self.rom_end] if dir.exists(): - raise Exception(f"SBN directory {dir} already exists") + self.warn(f"SBN directory {dir} already exists") sbn = SBN() byte_count = sbn.decode(data)