3 Commits
fix-ci ... sumo

Author SHA1 Message Date
Steven Walter
8b0b52d5b3 Merge pull request #221 from stfl/sumo_cargo_22
libstd don't fail if incremental build files don't exist (sumo)
2018-12-05 11:12:38 -05:00
Stefan Lendl
1587d5b8dc libstd don't fail if incremental build files don't exist (sumo) 2018-12-05 15:48:38 +01:00
Derek Straka
3efa0f069f Update Jenkins file to point to sumo branches
Signed-off-by: Derek Straka <derek@asterius.io>
2018-05-22 09:44:21 -04:00
2 changed files with 3 additions and 3 deletions

4
Jenkinsfile vendored
View File

@@ -15,7 +15,7 @@ for (int i = 0; i < targets.size(); i++) {
sh "./scripts/setup-env.sh"
}
stage("fetch $machine") {
sh "GIT_LOCAL_REF_DIR=/srv/git-cache/ ./scripts/fetch.sh master"
sh "GIT_LOCAL_REF_DIR=/srv/git-cache/ ./scripts/fetch.sh sumo"
}
stage("build $machine") {
sh "MACHINE=${machine} ./scripts/build.sh"
@@ -25,7 +25,7 @@ for (int i = 0; i < targets.size(); i++) {
throw e
} finally {
stage("push build cache $machine") {
sh "./scripts/publish-build-cache.sh master"
sh "./scripts/publish-build-cache.sh sumo"
}
stage("cleanup $machine") {
sh "./scripts/cleanup-env.sh"

View File

@@ -23,6 +23,6 @@ do_install () {
# With the incremental build support added in 1.24, the libstd deps directory also includes dependency
# files that get installed. Those are really only needed to incrementally rebuild the libstd library
# itself and don't need to be installed.
rm ${B}/${TARGET_SYS}/release/deps/*.d
rm -f ${B}/${TARGET_SYS}/release/deps/*.d
cp ${B}/${TARGET_SYS}/release/deps/* ${D}${rustlibdir}
}