Compare commits

...

2 Commits

Author SHA1 Message Date
Dustin ad77a3a035 ci: Trigger cross-rust build on success
Aimee OS/container-images/pipeline/head There was a failure building this commit Details
When the "cross" image finishes building, Jenkins will start building a
new "cross-rust" image on top of it.
2024-12-22 09:16:29 -06:00
Dustin 7946b8c084 Do not cross-compile Rust
This will happen in a separate layer.
2024-12-22 09:15:47 -06:00
2 changed files with 4 additions and 32 deletions

4
ci/Jenkinsfile vendored
View File

@ -49,6 +49,10 @@ pipeline {
} }
post { post {
success {
build "${BRANCH_NAME.replace('cross/', 'cross-rust%2F')}"
}
failure { failure {
sh 'unshare -Ur --map-auto chown root:root -R tmp log' sh 'unshare -Ur --map-auto chown root:root -R tmp log'
dir('tmp/portage') { dir('tmp/portage') {

View File

@ -23,35 +23,3 @@ EOF
emerge -kvnj --rebuilt-binaries=y sys-devel/crossdev emerge -kvnj --rebuilt-binaries=y sys-devel/crossdev
crossdev --stable -t "$1" crossdev --stable -t "$1"
ln -s /var/db/repos/gentoo/sys-devel/rust-std /var/db/repos/crossdev/cross-${target}/
case ${target%%-*} in
aarch64)
llvm_target=AArch64
;;
arm*)
llvm_target=ARM
;;
*)
printf 'Unknown LLVM target: %s' "${target%%-*}"
exit 1
;;
esac
mkdir -p \
/etc/portage/env/dev-lang \
/etc/portage/package.accept_keywords \
/etc/portage/package.use \
&& :
printf 'cross-%s/rust-std **\n' "${target}" \
> /etc/portage/package.accept_keywords/rust-cross
printf 'dev-lang/rust rust-src LLVM_TARGETS: %s\n' \
"${llvm_target}" \
> /etc/portage/package.use/rust-src
printf 'RUST_CROSS_TARGETS=( %s:%s:%s )\n' \
"${llvm_target}" \
"${target}" \
"${target}" \
>> /etc/portage/env/dev-lang/rust
emerge -vbknj cross-${target}/rust-std