Raymond Toy pushed to branch issue-389-reduce-duplication-in-ci-rules at cmucl / cmucl Commits: f95895bf by Raymond Toy at 2025-02-25T18:17:18-08:00 Move .gitlab-ci-functions.yml into .gitlab-ci.yml Let's put everything into .gitlab-ci.yml for now since it's pretty simple so that everything is in one place. Remove the file .gitlab-ci-functions.yml since it's not needed anymore. - - - - - 2 changed files: - − .gitlab-ci-functions.yml - .gitlab-ci.yml Changes: ===================================== .gitlab-ci-functions.yml deleted ===================================== @@ -1,14 +0,0 @@ -.build_cmucl: - script: - # Do cross compile first - #- bin/create-target.sh xtarget x86_linux_clang - #- bin/create-target.sh xcross x86_linux_clang - #- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp - # Regular build using the cross-compiled result or snapshot. The - # analyzer job requires gcc, so make sure we build with gcc here - # instead of clang. - - bin/build.sh $bootstrap -b build -R -C "" -o snapshot/bin/lisp - # When the result of `git describe` cannot be used as a version - # string, an alternative can be provided with the -V flag - - bin/make-dist.sh -I dist build-4 - ===================================== .gitlab-ci.yml ===================================== @@ -3,9 +3,22 @@ variables: version: "2024-08-x86" bootstrap: "-B boot-2024-08" -include: - - local: .gitlab-ci-functions.yml - +# Rule to build cmucl for all OSes, assuming we don't need anything +# special and the option '-C ""' is good enough. +.build_cmucl: + script: + # Do cross compile first + #- bin/create-target.sh xtarget x86_linux_clang + #- bin/create-target.sh xcross x86_linux_clang + #- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp + # Regular build using the cross-compiled result or snapshot. The + # analyzer job requires gcc, so make sure we build with gcc here + # instead of clang. + - bin/build.sh $bootstrap -b build -R -C "" -o snapshot/bin/lisp + # When the result of `git describe` cannot be used as a version + # string, an alternative can be provided with the -V flag + - bin/make-dist.sh -I dist build-4 + stages: - install - build View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f95895bfae0ab6b193320fdc... -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f95895bfae0ab6b193320fdc... You're receiving this email because of your account on gitlab.common-lisp.net.