- cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl][issue-389-reduce-duplication-in-ci-rules] 3 commits: Fix #388: Analyzer stage needs cmucl-version.h
by Raymond Toy (＠rtoy) 26 Feb '25

26 Feb '25

Raymond Toy pushed to branch issue-389-reduce-duplication-in-ci-rules at cmucl / cmucl Commits: 490b48a3 by Raymond Toy at 2025-02-24T04:03:16+00:00 Fix #388: Analyzer stage needs cmucl-version.h - - - - - c0b4f40a by Raymond Toy at 2025-02-24T04:03:16+00:00 Merge branch 'issue-388-fix-linux-analyzer-stage' into 'master' Fix #388: Analyzer stage needs cmucl-version.h Closes #388 See merge request cmucl/cmucl!273 - - - - - 3a3ba14c by Raymond Toy at 2025-02-26T07:15:45-08:00 Merge branch 'master' into issue-389-reduce-duplication-in-ci-rules - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/7b95435cff4d323502d96a… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/7b95435cff4d323502d96a… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-389-reduce-duplication-in-ci-rules] Need cmucl-version.h for linux analyzer
by Raymond Toy (＠rtoy) 26 Feb '25

26 Feb '25

Raymond Toy pushed to branch issue-389-reduce-duplication-in-ci-rules at cmucl / cmucl Commits: 7b95435c by Raymond Toy at 2025-02-26T07:11:29-08:00 Need cmucl-version.h for linux analyzer Update .build_template to include src/lisp/cmucl-version.h artifact that's needed by linux analyzer stage. Just save this for all builds. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -33,6 +33,8 @@ variables: - build-2/*.log - build-3/*.log - build-4/ + # Needed by Linux analyzer stage + - src/lisp/cmucl-version.h script: # Do cross compile first #- bin/create-target.sh xtarget x86_linux_clang View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7b95435cff4d323502d96a5… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7b95435cff4d323502d96a5… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-389-reduce-duplication-in-ci-rules] Cleanups and more comments
by Raymond Toy (＠rtoy) 26 Feb '25

26 Feb '25

Raymond Toy pushed to branch issue-389-reduce-duplication-in-ci-rules at cmucl / cmucl Commits: 56f4d3db by Raymond Toy at 2025-02-26T07:07:06-08:00 Cleanups and more comments - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -3,7 +3,8 @@ variables: version: "2024-08-x86" bootstrap: "-B boot-2024-08" -# Install configuration +# Default install configuration to download the cmucl tarballs to use +# for building. .install_template: &install_configuration stage: install artifacts: @@ -21,7 +22,9 @@ variables: # Default build configuration to be added to each build stage for each # OS. This assumes we don't need anything special between OSes, and -# the option '-C ""' is good enough. +# the option '-C ""' is good enough. We also override the default +# build dirs by using the -b option so that we know where the results +# are, independent of OS. .build_template: &build_configuration stage: build artifacts: @@ -95,7 +98,7 @@ stages: cache: - +#### Linux jobs #### linux:install: <<: *install_configuration tags: @@ -191,6 +194,7 @@ linux:benchmark: artifacts: true - job: linux:build +#### OSX (Mac) jobs #### osx:install: <<: *install_configuration tags: @@ -264,6 +268,7 @@ linux:static-analyzer: - make -C build-4/lisp clean - make -C build-4/lisp CFLAGS=-fanalyzer > analyzer.log 2>&1 +#### OpenSUSE jobs #### opensuse:install: <<: *install_configuration tags: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/56f4d3dbd98e92b56623ddd… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/56f4d3dbd98e92b56623ddd… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-389-reduce-duplication-in-ci-rules] Move .build_cmucl into .build_template
by Raymond Toy (＠rtoy) 26 Feb '25

26 Feb '25

Raymond Toy pushed to branch issue-389-reduce-duplication-in-ci-rules at cmucl / cmucl Commits: 436934e0 by Raymond Toy at 2025-02-26T06:17:29-08:00 Move .build_cmucl into .build_template The script from .build_cmucl can be moved to .build_template since it's the same for all OSes now. Remove .build_cmucl and references to it. Also remove commented-out calls to wget since we're using curl now. Fix typo in linux:static-analyzer that was using the directory "linux-4". It's "build-4" now. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -13,16 +13,23 @@ variables: - echo PATH = $PATH - ls -F /usr/local/bin - type -all gitlab-runner + # Download binaries. (Do we really need the extras tarball?) - $CURL -o cmucl-$version-$osname.tar.bz2 $download_url/cmucl-$version-$osname.tar.bz2 - $CURL -o cmucl-$version-$osname.extra.tar.bz2 $download_url/cmucl-$version-$osname.extra.tar.bz2 - #- wget -nv $download_url/cmucl-$version-$osname.tar.bz2 - #- wget -nv $download_url/cmucl-$version-$osname.extra.tar.bz2 - mkdir snapshot - (cd snapshot; tar xjf ../cmucl-$version-$osname.tar.bz2; tar xjf ../cmucl-$version-$osname.extra.tar.bz2) -# Rule to build cmucl for all OSes, assuming we don't need anything -# special and the option '-C ""' is good enough. -.build_cmucl: +# Default build configuration to be added to each build stage for each +# OS. This assumes we don't need anything special between OSes, and +# the option '-C ""' is good enough. +.build_template: &build_configuration + stage: build + artifacts: + paths: + - dist/ + - build-2/*.log + - build-3/*.log + - build-4/ script: # Do cross compile first #- bin/create-target.sh xtarget x86_linux_clang @@ -36,18 +43,6 @@ variables: # string, an alternative can be provided with the -V flag - bin/make-dist.sh -I dist build-4 - -# Default build configuration to be added to each build stage for each -# OS. -.build_template: &build_configuration - stage: build - artifacts: - paths: - - dist/ - - build-2/*.log - - build-3/*.log - - build-4/ - # Default configuration for running the ansi-tests. .ansi_test_template: &ansi_test_configuration stage: ansi-test @@ -116,8 +111,6 @@ linux:build: needs: - job: linux:install artifacts: true - script: - - !reference [.build_cmucl, script] linux:cross-build: stage: build @@ -213,8 +206,6 @@ osx:build: needs: - job: osx:install artifacts: true - script: - - !reference [.build_cmucl, script] osx:test: <<: *unit_test_configuration @@ -270,8 +261,8 @@ linux:static-analyzer: # the results to the log file instead of also having it go to the # console. If someday there's less or no output, we can consider # having the logs go to the console too. - - make -C linux-4/lisp clean - - make -C linux-4/lisp CFLAGS=-fanalyzer > analyzer.log 2>&1 + - make -C build-4/lisp clean + - make -C build-4/lisp CFLAGS=-fanalyzer > analyzer.log 2>&1 opensuse:install: <<: *install_configuration @@ -288,8 +279,6 @@ opensuse:build: needs: - job: opensuse:install artifacts: true - script: - - !reference [.build_cmucl, script] opensuse:test: <<: *unit_test_configuration View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/436934e0accdc857dbbfb06… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/436934e0accdc857dbbfb06… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-389-reduce-duplication-in-ci-rules] Use install_configuration for osx:install
by Raymond Toy (＠rtoy) 26 Feb '25

26 Feb '25

Raymond Toy pushed to branch issue-389-reduce-duplication-in-ci-rules at cmucl / cmucl Commits: 0711cd7b by Raymond Toy at 2025-02-26T06:01:39-08:00 Use install_configuration for osx:install Modify install_configuration to use curl on all platforms since we don't have wget on osx. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -10,8 +10,13 @@ variables: paths: - snapshot/ script: - - wget -nv $download_url/cmucl-$version-$osname.tar.bz2 - - wget -nv $download_url/cmucl-$version-$osname.extra.tar.bz2 + - echo PATH = $PATH + - ls -F /usr/local/bin + - type -all gitlab-runner + - $CURL -o cmucl-$version-$osname.tar.bz2 $download_url/cmucl-$version-$osname.tar.bz2 + - $CURL -o cmucl-$version-$osname.extra.tar.bz2 $download_url/cmucl-$version-$osname.extra.tar.bz2 + #- wget -nv $download_url/cmucl-$version-$osname.tar.bz2 + #- wget -nv $download_url/cmucl-$version-$osname.extra.tar.bz2 - mkdir snapshot - (cd snapshot; tar xjf ../cmucl-$version-$osname.tar.bz2; tar xjf ../cmucl-$version-$osname.extra.tar.bz2) @@ -102,6 +107,7 @@ linux:install: - linux variables: osname: "linux" + CURL: "curl" linux:build: <<: *build_configuration @@ -193,19 +199,12 @@ linux:benchmark: - job: linux:build osx:install: - stage: install + <<: *install_configuration tags: - macos-virtualbox - artifacts: - paths: - - snapshot/ - script: - - echo PATH = $PATH - - ls -F /usr/local/bin - - type -all gitlab-runner - - /opt/local/bin/curl -o cmucl-$version-darwin.tar.bz2 $download_url/cmucl-$version-darwin.tar.bz2 - - mkdir snapshot - - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2) + variables: + osname: "darwin" + CURL: "/opt/local/bin/curl" osx:build: <<: *build_configuration @@ -280,6 +279,7 @@ opensuse:install: - opensuse variables: osname: "linux" + CURL: "curl" opensuse:build: <<: *build_configuration View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/0711cd7b9de6721d06af717… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/0711cd7b9de6721d06af717… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-389-reduce-duplication-in-ci-rules] Use install_configuration for opensuse:install
by Raymond Toy (＠rtoy) 26 Feb '25

26 Feb '25

Raymond Toy pushed to branch issue-389-reduce-duplication-in-ci-rules at cmucl / cmucl Commits: 978bd000 by Raymond Toy at 2025-02-26T05:35:58-08:00 Use install_configuration for opensuse:install We can use the install_configuration for opensuse:install job. Can't yet use it for osx. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -275,17 +275,11 @@ linux:static-analyzer: - make -C linux-4/lisp CFLAGS=-fanalyzer > analyzer.log 2>&1 opensuse:install: - stage: install + <<: *install_configuration tags: - opensuse - artifacts: - paths: - - snapshot/ - script: - - wget -nv $download_url/cmucl-$version-linux.tar.bz2 - - wget -nv $download_url/cmucl-$version-linux.extra.tar.bz2 - - mkdir snapshot - - (cd snapshot; tar xjf ../cmucl-$version-linux.tar.bz2; tar xjf ../cmucl-$version-linux.extra.tar.bz2) + variables: + osname: "linux" opensuse:build: <<: *build_configuration View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/978bd000ce15cfe41ab518a… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/978bd000ce15cfe41ab518a… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-389-reduce-duplication-in-ci-rules] Abstract out the common bits of the install job
by Raymond Toy (＠rtoy) 26 Feb '25

26 Feb '25

Raymond Toy pushed to branch issue-389-reduce-duplication-in-ci-rules at cmucl / cmucl Commits: d112e61c by Raymond Toy at 2025-02-26T05:30:40-08:00 Abstract out the common bits of the install job All of the install jobs are basically the same except for the name of the tarball that we want to download. Move this to a template and add a variable to select the name of the OS to use for the tarball name. Implement just for linux:install for now, for testing. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -3,6 +3,18 @@ variables: version: "2024-08-x86" bootstrap: "-B boot-2024-08" +# Install configuration +.install_template: &install_configuration + stage: install + artifacts: + paths: + - snapshot/ + script: + - wget -nv $download_url/cmucl-$version-$osname.tar.bz2 + - wget -nv $download_url/cmucl-$version-$osname.extra.tar.bz2 + - mkdir snapshot + - (cd snapshot; tar xjf ../cmucl-$version-$osname.tar.bz2; tar xjf ../cmucl-$version-$osname.extra.tar.bz2) + # Rule to build cmucl for all OSes, assuming we don't need anything # special and the option '-C ""' is good enough. .build_cmucl: @@ -19,6 +31,7 @@ variables: # string, an alternative can be provided with the -V flag - bin/make-dist.sh -I dist build-4 + # Default build configuration to be added to each build stage for each # OS. .build_template: &build_configuration @@ -84,17 +97,11 @@ cache: linux:install: - stage: install + <<: *install_configuration tags: - linux - artifacts: - paths: - - snapshot/ - script: - - wget -nv $download_url/cmucl-$version-linux.tar.bz2 - - wget -nv $download_url/cmucl-$version-linux.extra.tar.bz2 - - mkdir snapshot - - (cd snapshot; tar xjf ../cmucl-$version-linux.tar.bz2; tar xjf ../cmucl-$version-linux.extra.tar.bz2) + variables: + osname: "linux" linux:build: <<: *build_configuration View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d112e61cd73f66db980e2f3… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d112e61cd73f66db980e2f3… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-389-reduce-duplication-in-ci-rules] Add configs for tests and benchmarks
by Raymond Toy (＠rtoy) 26 Feb '25

26 Feb '25

Raymond Toy pushed to branch issue-389-reduce-duplication-in-ci-rules at cmucl / cmucl Commits: 08608c68 by Raymond Toy at 2025-02-25T19:31:39-08:00 Add configs for tests and benchmarks There's lots of duplication for running the ansi tests, unit tests, and benchmarks. Add templates and configs for these so the common stuff is in the base configs that can be used for the individual jobs. Also fixed a couple of typos where the opensuse jobs had a tag of "linux" instead of "opensuse". - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -29,7 +29,49 @@ variables: - build-2/*.log - build-3/*.log - build-4/ + +# Default configuration for running the ansi-tests. +.ansi_test_template: &ansi_test_configuration + stage: ansi-test + artifacts: + paths: + - ansi-test/test.out + script: + - bin/run-ansi-tests.sh -l dist/bin/lisp +# Default configuration for running unit tests. +.unit_test_template: &unit_test_configuration + stage: test + artifacts: + paths: + - ansi-test/test.out + - test.log + script: + - echo LANG = $LANG + - bin/run-unit-tests.sh -l dist/bin/lisp 2>&1 | tee test.log + +# Default configuration to test creation of lisp executable and +# testing the exectuable works. +.exec_test_template: &exec_test_configuration + stage: test + script: + # Create an executable and test it by printing the version. + - dist/bin/lisp -eval '(save-lisp "saved-lisp-executable" :executable t)' + - ./saved-lisp-executable --version + +# Default configuration for running the benchmarks. +.benchmark_template: &benchmark_configuration + stage: benchmark + artifacts: + paths: + - benchmarks/cl-bench/results + script: + - cd benchmarks/cl-bench + - mkdir tmp + - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh + - CMUCL=../../dist/bin/lisp ./run-cmucl.sh + - ../../snapshot/bin/lisp -load report + stages: - install - build @@ -93,31 +135,21 @@ linux:cross-build: - bin/make-dist.sh -I xdist xlinux-4 linux:test: - stage: test + <<: *unit_test_configuration tags: - linux - artifacts: - paths: - - ansi-test/test.out - - test.log needs: # Needs artifacts from build (dist/) - job: linux:build artifacts: true - script: - - bin/run-unit-tests.sh -l dist/bin/lisp 2>&1 | tee test.log linux:exec-test: - stage: test + <<: *exec_test_configuration tags: - linux needs: - job: linux:build artifacts: true - script: - # Create an executable and test it by printing the version. - - dist/bin/lisp -eval '(save-lisp "saved-lisp-executable" :executable t)' - - ./saved-lisp-executable --version linux:cross-test: stage: test @@ -135,37 +167,23 @@ linux:cross-test: - bin/run-unit-tests.sh -l xdist/bin/lisp 2>&1 | tee cross-test.log linux:ansi-test: - stage: ansi-test + <<: *ansi_test_configuration tags: - linux - artifacts: - paths: - - ansi-test/test.out needs: # Needs artifacts from build (dist/) - job: linux:build artifacts: true - script: - - bin/run-ansi-tests.sh -l dist/bin/lisp linux:benchmark: - stage: benchmark + <<: *benchmark_configuration tags: - linux - artifacts: - paths: - - benchmarks/cl-bench/results needs: # Needs artifacts from install (snapshot/) and build (dist/) - job: linux:install artifacts: true - job: linux:build - script: - - cd benchmarks/cl-bench - - mkdir tmp - - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh - - CMUCL=../../dist/bin/lisp ./run-cmucl.sh - - ../../snapshot/bin/lisp -load report osx:install: stage: install @@ -193,68 +211,40 @@ osx:build: - !reference [.build_cmucl, script] osx:test: - stage: test + <<: *unit_test_configuration tags: - macos-virtualbox - artifacts: - paths: - - ansi-test/test.out - - test.log needs: # Needs artifacts from build (dist/) - job: osx:build artifacts: true - script: - - echo LANG = $LANG - - bin/run-unit-tests.sh -l dist/bin/lisp 2>&1 | tee test.log osx:exec-test: - stage: test + <<: *exec_test_configuration tags: - macos-virtualbox needs: - job: osx:build artifacts: true - script: - # Create an executable and test it by printing the version. - - dist/bin/lisp -eval '(save-lisp "saved-lisp-executable" :executable t)' - - ./saved-lisp-executable --version osx:ansi-test: - stage: ansi-test + <<: *ansi_test_configuration tags: - macos-virtualbox - artifacts: - paths: - - ansi-test/test.out needs: # Needs artifacts from build (dist/) - job: osx:build artifacts: true - script: - # NB: sometimes we can't clone the ansi-test repo (bad cert!?!). - # Manually cloning it in the gitlab build dir helps with this - # issue until we can figure out what's going on. - - bin/run-ansi-tests.sh -l dist/bin/lisp osx:benchmark: - stage: benchmark + <<: *benchmark_configuration tags: - macos-virtualbox - artifacts: - paths: - - benchmarks/cl-bench/results needs: # Needs artifacts from install (snapshot/) and build (dist/) - job: osx:install artifacts: true - job: osx:build - script: - - cd benchmarks/cl-bench - - mkdir tmp - - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh - - CMUCL=../../dist/bin/lisp ./run-cmucl.sh - - ../../snapshot/bin/lisp -load report # Optional job that runs the static analyzer. It needs the files from # the linux-4 directory built in the linux:build job. @@ -301,31 +291,20 @@ opensuse:build: - !reference [.build_cmucl, script] opensuse:test: - stage: test + <<: *unit_test_configuration tags: - - linux - artifacts: - paths: - - ansi-test/test.out - - test.log + - opensuse needs: # Needs artifacts from build (dist/) - job: opensuse:build artifacts: true - script: - - bin/run-unit-tests.sh -l dist/bin/lisp 2>&1 | tee test.log opensuse:ansi-test: - stage: ansi-test + <<: *ansi_test_configuration tags: - - linux - artifacts: - paths: - - ansi-test/test.out + - opensuse needs: # Needs artifacts from build (dist/) - job: opensuse:build artifacts: true - script: - - bin/run-ansi-tests.sh -l dist/bin/lisp View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/08608c68aff9dfa745ed3a5… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/08608c68aff9dfa745ed3a5… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-389-reduce-duplication-in-ci-rules] Add build_configuration to config builds
by Raymond Toy (＠rtoy) 26 Feb '25

26 Feb '25

Raymond Toy pushed to branch issue-389-reduce-duplication-in-ci-rules at cmucl / cmucl Commits: db21030a by Raymond Toy at 2025-02-25T18:25:56-08:00 Add build_configuration to config builds Add build template to configure the build stage. The configuration should work for all OSes to set up the stage, and the artifacts. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -18,7 +18,18 @@ variables: # 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 - + +# Default build configuration to be added to each build stage for each +# OS. +.build_template: &build_configuration + stage: build + artifacts: + paths: + - dist/ + - build-2/*.log + - build-3/*.log + - build-4/ + stages: - install - build @@ -44,15 +55,9 @@ linux:install: - (cd snapshot; tar xjf ../cmucl-$version-linux.tar.bz2; tar xjf ../cmucl-$version-linux.extra.tar.bz2) linux:build: - stage: build + <<: *build_configuration tags: - linux - artifacts: - paths: - - dist/ - - build-2/*.log - - build-3/*.log - - build-4/ needs: - job: linux:install artifacts: true @@ -178,15 +183,9 @@ osx:install: - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2) osx:build: - stage: build + <<: *build_configuration tags: - macos-virtualbox - artifacts: - paths: - - dist/ - - darwin-2/*.log - - darwin-3/*.log - - darwin-4/*.log needs: - job: osx:install artifacts: true @@ -292,15 +291,9 @@ opensuse:install: - (cd snapshot; tar xjf ../cmucl-$version-linux.tar.bz2; tar xjf ../cmucl-$version-linux.extra.tar.bz2) opensuse:build: - stage: build + <<: *build_configuration tags: - opensuse - artifacts: - paths: - - dist/ - - build-2/*.log - - build-3/*.log - - build-4/ needs: - job: opensuse:install artifacts: true View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/db21030a7bb3d918f43a8d3… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/db21030a7bb3d918f43a8d3… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-389-reduce-duplication-in-ci-rules] Move .gitlab-ci-functions.yml into .gitlab-ci.yml
by Raymond Toy (＠rtoy) 26 Feb '25

26 Feb '25

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/f95895bfae0ab6b193320fd… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f95895bfae0ab6b193320fd… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0