Merge branch 'jenkins' into devel
This commit is contained in:
commit
d39f961ecf
|
@ -1,24 +1,21 @@
|
|||
def runStages() {
|
||||
try {
|
||||
stage("Clone") {
|
||||
// The Git repo seems to be cached in some Jenkins plugin, so this is not always a clean clone.
|
||||
checkout scm
|
||||
sh "make build-system-checks || true"
|
||||
}
|
||||
|
||||
// caching doesn't work; extension probably not configured
|
||||
|
||||
//cache(maxCacheSize: 250, caches: [
|
||||
//[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/vendor/nimbus-build-system/vendor/Nim/bin"],
|
||||
//[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/vendor/go/bin"],
|
||||
//[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/jsonTestsCache"]
|
||||
//]) {
|
||||
cache(maxCacheSize: 250, caches: [
|
||||
[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/vendor/nimbus-build-system/vendor/Nim/bin"],
|
||||
[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/vendor/go/bin"],
|
||||
[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/jsonTestsCache"]
|
||||
]) {
|
||||
stage("Build") {
|
||||
sh "make -j${env.NPROC} update" /* to allow a newer Nim version to be detected */
|
||||
sh "make -j${env.NPROC} deps" /* to allow the following parallel stages */
|
||||
sh "scripts/setup_official_tests.sh jsonTestsCache"
|
||||
}
|
||||
//}
|
||||
}
|
||||
|
||||
stage("Test") {
|
||||
parallel(
|
||||
|
@ -36,6 +33,7 @@ def runStages() {
|
|||
}
|
||||
} catch(e) {
|
||||
echo "'${env.STAGE_NAME}' stage failed"
|
||||
// we need to rethrow the exception here
|
||||
throw e
|
||||
} finally {
|
||||
cleanWs()
|
||||
|
|
3
Makefile
3
Makefile
|
@ -34,7 +34,8 @@ build-system-checks:
|
|||
@[[ -e "$(BUILD_SYSTEM_DIR)/makefiles" ]] || { \
|
||||
echo -e "'$(BUILD_SYSTEM_DIR)/makefiles' not found. Running '$(GIT_SUBMODULE_UPDATE)'.\n"; \
|
||||
$(GIT_SUBMODULE_UPDATE); \
|
||||
echo -e "\n✔️✔️✔️ Successfully fetched all required internal dependencies."; \
|
||||
CHECKMARK="\xe2\x9c\x94\xef\xb8\x8f"; \
|
||||
echo -e "\n$${CHECKMARK}$${CHECKMARK}$${CHECKMARK} Successfully fetched all required internal dependencies."; \
|
||||
echo -e " You should now \e[4mre-run '$(MAKE)' to build Nimbus\e[0m\n"; \
|
||||
}; \
|
||||
exit 0
|
||||
|
|
Loading…
Reference in New Issue