From 03b0f4c1753dc7bc3f4950f7e49ddbb4bf410ceb Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Thu, 6 Apr 2023 18:54:50 -0300 Subject: [PATCH] Jenkins: Fix incorrect shortening of directory tree --- .ci/Jenkinsfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index b9a095554..d65f774d1 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -283,13 +283,17 @@ pipeline { def archName = archNames[archSlug] if (os == 'macOS') archName = archNamesMac[archSlug] - dir("${dynarecNames[dynarec]}/$os - $archName") { - ret = runBuild("-b \"$packageName\" \"$arch\" ${presetFlags[preset]} ${dynarecFlags[dynarec]} ${osFlags[os]} $buildFlags") + dir(dynarecNames[dynarec]) { + dir("$os - $archName") { + ret = runBuild("-b \"$packageName\" \"$arch\" ${presetFlags[preset]} ${dynarecFlags[dynarec]} ${osFlags[os]} $buildFlags") + writeFile file: '.forcedir', text: '' + } + writeFile file: '.forcedir', text: '' } if (ret == 0) { /* Archive resulting artifacts. */ - archiveArtifacts artifacts: "**/**/$packageName*" + archiveArtifacts artifacts: "**/$packageName*, **/.forcedir" } else { /* Fail this stage. */ failStage()