Skip to content

Commit 1702aed

Browse files
Attempt 18
1 parent 673f786 commit 1702aed

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

Jenkinsfile

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -434,26 +434,32 @@ pipeline
434434
CheckNightlyTag('$GITHUB_TOKEN', REPO_OWNER, REPO_NAME, GIT_HASH)
435435

436436
// Upload Linux executable
437-
unstash 'linux_build'
438-
if (fileExists('Build/Src/runcpp2/runcpp2')) {
437+
dir('WindowsBuild') { unstash 'windows_build' }
438+
dir('LinuxBuild') { unstash 'linux_build' }
439+
if (fileExists('LinuxBuild/Build/runcpp2')) {
439440
bash """
440-
cd Build/Src/runcpp2
441-
zip -9 ../../../../runcpp2-linux.zip runcpp2
442-
cd ../../../..
441+
cd LinuxBuild/Build
442+
zip -9 ../../runcpp2-linux.zip runcpp2
443443
"""
444444
UploadArtifactToGithub('$GITHUB_TOKEN', REPO_OWNER, REPO_NAME, "nightly", "runcpp2-linux.zip", "runcpp2-linux.zip")
445445
}
446+
else
447+
{
448+
error('Failed to find linux build')
449+
}
446450

447451
// Upload Windows executable
448-
unstash 'windows_build'
449-
if (fileExists('Build/Src/runcpp2/runcpp2.exe')) {
452+
if (fileExists('WindowsBuild/Build/Debug/runcpp2.exe')) {
450453
bash """
451-
cd Build/Src/runcpp2
452-
zip -9 ../../../../runcpp2-windows.zip runcpp2.exe
453-
cd ../../../..
454+
cd WindowsBuild/Build/Debug
455+
zip -9 ../../../runcpp2-windows.zip runcpp2.exe
454456
"""
455457
UploadArtifactToGithub('$GITHUB_TOKEN', REPO_OWNER, REPO_NAME, "nightly", "runcpp2-windows.zip", "runcpp2-windows.zip")
456458
}
459+
else
460+
{
461+
error('Failed to find windows build')
462+
}
457463
}
458464
}
459465
}

0 commit comments

Comments
 (0)