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

[Git][cmucl/cmucl] Pushed new branch issue-393-os-common-getpwuid
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed new branch issue-393-os-common-getpwuid at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-393-os-common-getpw… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-381-darwin-pathname-docstring
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed new branch issue-381-darwin-pathname-docstring at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-381-darwin-pathname… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] Address review: fix typo in comment
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: d71cbd83 by Raymond Toy at 2025-03-26T08:37:41-07:00 Address review: fix typo in comment - - - - - 1 changed file: - bin/create-errno.sh Changes: ===================================== bin/create-errno.sh ===================================== @@ -1,6 +1,6 @@ #! /bin/sh -# Generates the contents of the file code/unix-errno.lisp. The args +# Generates the contents of the file code/errno.lisp. The args # to this script, if supplied, must be a list of files containing the # definitions of all the Unix errno values. # View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d71cbd8358eb7f5f900935c… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d71cbd8358eb7f5f900935c… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] ERRNO package needs to use LISP package
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: a9d96134 by Raymond Toy at 2025-03-25T20:02:23-07:00 ERRNO package needs to use LISP package Just do the same thing that is done with the UNIX package which also needs to use the LISP package. (I think this was working but somehow got dropped somewhere along the way? Anyway, we're adding it back in now.) - - - - - 1 changed file: - src/code/exports.lisp Changes: ===================================== src/code/exports.lisp ===================================== @@ -139,6 +139,7 @@ (use-package '("SYSTEM" "ALIEN-INTERNALS" "ALIEN" "LISP") "C-CALL") (use-package '("KERNEL" "EXTENSIONS" "LISP") "INSPECT") (use-package '("LISP" "KERNEL") "BIGNUM") +(use-package '("LISP") "ERRNO") (use-package '("LISP") "UNIX") (use-package '("KERNEL" "LISP" "EXTENSIONS") "FORMAT") (use-package '("EXTENSIONS" "SYSTEM" "DEBUG" "KERNEL" "BIGNUM") "LISP") View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a9d961341217941ad0aea6b… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a9d961341217941ad0aea6b… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-391-load-world-can-set-lisp-impl-ver] Get version from cmucl-version.h if possible
by Raymond Toy (＠rtoy) 25 Mar '25

25 Mar '25

Raymond Toy pushed to branch issue-391-load-world-can-set-lisp-impl-ver at cmucl / cmucl Commits: 87ea5a78 by Raymond Toy at 2025-03-25T16:41:00-07:00 Get version from cmucl-version.h if possible If the `-v` option is not given, first try to get the version from src/lisp/cmucl-version.h if it exists. Otherwise just use git-version.sh. We do this so that `*lisp-implementation-version*` has the value that is compiled into lisp. - - - - - 1 changed file: - bin/load-world.sh Changes: ===================================== bin/load-world.sh ===================================== @@ -41,7 +41,15 @@ fi # If version string not given, use the git version if [ -z "$VERSION" ]; then - VERSION=`bin/git-version.sh` + # Try to get the version from cmucl-version.h so that we match + # exactly what was used for building lisp. Otherwise, fall back + # to git-version.sh + FILE="src/lisp/cmucl-version.h" + if [ -f "$FILE" ]; then + VERSION=`grep CMUCL_VERSION "$FILE" | sed 's/^.*CMUCL_VERSION //'` + else + VERSION=`bin/git-version.sh` + fi fi $TARGET/lisp/lisp -core $TARGET/lisp/kernel.core <<EOF View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/87ea5a78531b0dfc5f6e6b1… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/87ea5a78531b0dfc5f6e6b1… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] 2 commits: Use .gitlab-ci.yml from master
by Raymond Toy (＠rtoy) 25 Mar '25

25 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: 9584ecf6 by Raymond Toy at 2025-03-25T08:22:26-07:00 Use .gitlab-ci.yml from master - - - - - 779d7096 by Raymond Toy at 2025-03-25T08:23:32-07:00 Add src/code/errno.lisp to artifacts Add the generated errno.lisp file to artifacts so we can examine it in the CI. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -3,45 +3,40 @@ variables: version: "2024-08-x86" bootstrap: "-B boot-2024-08" - -stages: - - install - - build - - test - - ansi-test - - benchmark - - analyze - -cache: - - -linux:install: +# Default install configuration to download the cmucl tarballs to use +# for building. +.install_template: &install_configuration stage: install - 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 + - 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 - mkdir snapshot - - (cd snapshot; tar xjf ../cmucl-$version-linux.tar.bz2; tar xjf ../cmucl-$version-linux.extra.tar.bz2) + - (cd snapshot; tar xjf ../cmucl-$version-$osname.tar.bz2; tar xjf ../cmucl-$version-$osname.extra.tar.bz2) -linux:build: +# 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. 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 - tags: - - linux artifacts: paths: - dist/ - - linux-2/*.log - - linux-3/*.log - - linux-4/ - - src/lisp/ - needs: - - job: linux:install - artifacts: true + - build-2/*.log + - build-3/*.log + - build-4/ + # Needed by Linux analyzer stage + - src/lisp/cmucl-version.h + # Save this so we can see the generated errno + - src/code/errno.lisp script: # Do cross compile first #- bin/create-target.sh xtarget x86_linux_clang @@ -50,11 +45,79 @@ linux:build: # 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 -R -C "x86_linux" -o snapshot/bin/lisp - # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp + - 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 linux-4 + - bin/make-dist.sh -I dist 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 + - test + - ansi-test + - benchmark + - analyze + +cache: + +#### Linux jobs #### +linux:install: + <<: *install_configuration + tags: + - linux + variables: + osname: "linux" + CURL: "curl" + +linux:build: + <<: *build_configuration + tags: + - linux + needs: + - job: linux:install + artifacts: true linux:cross-build: stage: build @@ -85,31 +148,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 @@ -127,142 +180,76 @@ 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 (Mac) jobs #### 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: - stage: build + <<: *build_configuration tags: - macos-virtualbox - artifacts: - paths: - - dist/ - - darwin-2/*.log - - darwin-3/*.log - - darwin-4/*.log - - src/code/errno.lisp needs: - job: osx:install artifacts: true - script: - # Do cross compile first - #- bin/create-target.sh xtarget x86_darwin - #- bin/create-target.sh xcross x86_darwin - #- 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. - # Need /opt/local/bin to get msgmerge and msgfmt programs. - - PATH=/opt/local/bin:$PATH bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - # If needed use -V to specify the version in case some tag makes git - # describe return something that make-dist.sh doesn't like. - - bin/make-dist.sh -I dist darwin-4 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. @@ -282,75 +269,41 @@ 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 jobs #### 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" + CURL: "curl" opensuse:build: - stage: build + <<: *build_configuration tags: - opensuse - artifacts: - paths: - - dist/ - - linux-2/*.log - - linux-3/*.log - - linux-4/ needs: - job: opensuse:install artifacts: true - 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 -R -C "x86_linux" -o snapshot/bin/lisp - # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp - # If needed use -V to specify the version in case some tag makes git - # describe return something that make-dist.sh doesn't like. - - bin/make-dist.sh -I dist linux-4 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/-/compare/32ab1575869bb665ea4c44… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/32ab1575869bb665ea4c44… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] 2 commits: Forgot to rename UNIX-ERRNO to ERRNO
by Raymond Toy (＠rtoy) 25 Mar '25

25 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: d5c2ab6a by Raymond Toy at 2025-03-02T06:05:53-08:00 Forgot to rename UNIX-ERRNO to ERRNO In !274, we renamed the package to ERRNO, but forgot to do the renaming in a few other places in exports.lisp. Fix that. - - - - - 32ab1575 by Raymond Toy at 2025-03-02T18:02:43-08:00 Merge branch 'master' into issue-386-generate-def-unix-error - - - - - 1 changed file: - src/code/exports.lisp Changes: ===================================== src/code/exports.lisp ===================================== @@ -31,9 +31,9 @@ (if (find-package "BIGNUM") (rename-package "BIGNUM" "BIGNUM" 'nil) (make-package "BIGNUM" :nicknames 'nil :use nil)) -(if (find-package "UNIX-ERRNO") - (rename-package "UNIX-ERRNO" "UNIX-ERRNO" 'nil) - (make-package "UNIX-ERRNO" :nicknames 'nil :use nil)) +(if (find-package "ERRNO") + (rename-package "ERRNO" "ERRNO" 'nil) + (make-package "ERRNO" :nicknames 'nil :use nil)) (if (find-package "UNIX") (rename-package "UNIX" "UNIX" 'nil) (make-package "UNIX" :nicknames 'nil :use nil)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/a354f30f572d025b1cc7b7… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/a354f30f572d025b1cc7b7… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-381-cmucl-unix-os-specific] Update according to review comments
by Raymond Toy (＠rtoy) 25 Mar '25

25 Mar '25

Raymond Toy pushed to branch issue-381-cmucl-unix-os-specific at cmucl / cmucl Commits: bc7c9267 by Raymond Toy at 2025-03-25T07:56:39-07:00 Update according to review comments Use correct docstring for `unix-getpwuid` on solaris and bsd. Change order of `if` statement for linux `unix-getpwuid` as requested. - - - - - 2 changed files: - src/code/unix.lisp - src/i18n/locale/cmucl-unix.pot Changes: ===================================== src/code/unix.lisp ===================================== @@ -2559,10 +2559,7 @@ #+solaris (defun unix-getpwuid (uid) - _N"Return a USER-INFO structure for the user identified by UID. If - not found, NIL is returned with a second value indicating the cause - of the failure. In particular, if the second value is 0 (or - ENONENT, ESRCH, EBADF, etc.), then the uid was not found." + _N"Return a USER-INFO structure for the user identified by UID, or NIL if not found." (declare (type unix-uid uid)) (with-alien ((buf (array c-call:char 1024)) (user-info (struct passwd))) @@ -2592,10 +2589,7 @@ #+bsd (defun unix-getpwuid (uid) - _N"Return a USER-INFO structure for the user identified by UID. If - not found, NIL is returned with a second value indicating the cause - of the failure. In particular, if the second value is 0 (or - ENONENT, ESRCH, EBADF, etc.), then the uid was not found." + _N"Return a USER-INFO structure for the user identified by UID, or NIL if not found." (declare (type unix-uid uid)) (let ((result (alien-funcall @@ -2637,7 +2631,8 @@ (cast buf (* c-call:char)) 1024 (addr result)))) - (if (not (zerop (sap-int (alien-sap result)))) + (if (null-alien result) + (values nil returned) (make-user-info :name (string (cast (slot result 'pw-name) c-call:c-string)) :password (string (cast (slot result 'pw-passwd) c-call:c-string)) @@ -2645,8 +2640,7 @@ :gid (slot result 'pw-gid) :gecos (string (cast (slot result 'pw-gecos) c-call:c-string)) :dir (string (cast (slot result 'pw-dir) c-call:c-string)) - :shell (string (cast (slot result 'pw-shell) c-call:c-string))) - (values nil returned))))) + :shell (string (cast (slot result 'pw-shell) c-call:c-string))))))) ;;; Getrusage is not provided in the C library on Solaris 2.4, and is ;;; rather slow on later versions so the "times" system call is ===================================== src/i18n/locale/cmucl-unix.pot ===================================== @@ -1346,6 +1346,12 @@ msgid "" " slots as in unix-getitimer." msgstr "" +#: src/code/unix.lisp +msgid "" +"Return a USER-INFO structure for the user identified by UID, or NIL if not " +"found." +msgstr "" + #: src/code/unix.lisp msgid "" "Return a USER-INFO structure for the user identified by UID. If\n" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/bc7c92675f63a1d5c37d1c4… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/bc7c92675f63a1d5c37d1c4… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #389: Reduce duplication in CI rules
by Raymond Toy (＠rtoy) 25 Mar '25

25 Mar '25

Raymond Toy pushed to branch master at cmucl / cmucl Commits: de2abad2 by Raymond Toy at 2025-03-25T14:10:15+00:00 Fix #389: Reduce duplication in CI rules - - - - - 7aaca65e by Raymond Toy at 2025-03-25T14:10:15+00:00 Merge branch 'issue-389-reduce-duplication-in-ci-rules' into 'master' Fix #389: Reduce duplication in CI rules Closes #389 See merge request cmucl/cmucl!275 - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -3,45 +3,38 @@ variables: version: "2024-08-x86" bootstrap: "-B boot-2024-08" - -stages: - - install - - build - - test - - ansi-test - - benchmark - - analyze - -cache: - - -linux:install: +# Default install configuration to download the cmucl tarballs to use +# for building. +.install_template: &install_configuration stage: install - 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 + - 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 - mkdir snapshot - - (cd snapshot; tar xjf ../cmucl-$version-linux.tar.bz2; tar xjf ../cmucl-$version-linux.extra.tar.bz2) + - (cd snapshot; tar xjf ../cmucl-$version-$osname.tar.bz2; tar xjf ../cmucl-$version-$osname.extra.tar.bz2) -linux:build: +# 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. 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 - tags: - - linux artifacts: paths: - dist/ - - linux-2/*.log - - linux-3/*.log - - linux-4/ - - src/lisp/ - needs: - - job: linux:install - artifacts: true + - 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 @@ -50,11 +43,79 @@ linux:build: # 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 -R -C "x86_linux" -o snapshot/bin/lisp - # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp + - 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 linux-4 + - bin/make-dist.sh -I dist 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 + - test + - ansi-test + - benchmark + - analyze + +cache: + +#### Linux jobs #### +linux:install: + <<: *install_configuration + tags: + - linux + variables: + osname: "linux" + CURL: "curl" + +linux:build: + <<: *build_configuration + tags: + - linux + needs: + - job: linux:install + artifacts: true linux:cross-build: stage: build @@ -85,31 +146,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 @@ -127,141 +178,76 @@ 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 (Mac) jobs #### 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: - 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 - script: - # Do cross compile first - #- bin/create-target.sh xtarget x86_darwin - #- bin/create-target.sh xcross x86_darwin - #- 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. - # Need /opt/local/bin to get msgmerge and msgfmt programs. - - PATH=/opt/local/bin:$PATH bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - # If needed use -V to specify the version in case some tag makes git - # describe return something that make-dist.sh doesn't like. - - bin/make-dist.sh -I dist darwin-4 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. @@ -281,75 +267,41 @@ 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 jobs #### 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" + CURL: "curl" opensuse:build: - stage: build + <<: *build_configuration tags: - opensuse - artifacts: - paths: - - dist/ - - linux-2/*.log - - linux-3/*.log - - linux-4/ needs: - job: opensuse:install artifacts: true - 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 -R -C "x86_linux" -o snapshot/bin/lisp - # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp - # If needed use -V to specify the version in case some tag makes git - # describe return something that make-dist.sh doesn't like. - - bin/make-dist.sh -I dist linux-4 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/-/compare/d5c2ab6aa76fead22efdd7… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/d5c2ab6aa76fead22efdd7… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-392-add-default-version-path-to-cmucllib
by Raymond Toy (＠rtoy) 24 Mar '25

24 Mar '25

Raymond Toy pushed new branch issue-392-add-default-version-path-to-cmucllib at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-392-add-default-ver… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0