Raymond Toy pushed to branch issue-299-enable-xoroshiro-assem-routine at cmucl / cmucl

Commits: ed577605 by Raymond Toy at 2024-04-08T20:22:10-07:00 Specify version when running make-dist.sh

Also print out the GIT_HASH so we can see why the -V option seems to be needed now.

- - - - -

2 changed files:

- .gitlab-ci.yml - bin/make-dist.sh

Changes:

===================================== .gitlab-ci.yml ===================================== @@ -48,7 +48,7 @@ linux:build: # Regular build using the cross-compiled result or snapshot - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp # - bin/build.sh $bootstrap -R -C "x86_linux" -o snapshot/bin/lisp - - bin/make-dist.sh -I dist linux-4 + - bin/make-dist.sh -V ci-build -I dist linux-4

linux:test: stage: test @@ -131,7 +131,7 @@ osx:build: # 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 - - bin/make-dist.sh -I dist darwin-4 + - bin/make-dist.sh -V ci-build -I dist darwin-4

osx:test: stage: test

===================================== bin/make-dist.sh ===================================== @@ -98,6 +98,8 @@ def_arch_os # ("snapshot-yyyy-mm") or a release number.. GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`"

+echo GIT_HASH = ${GIT_HASH} + if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-(.*)"` fi

View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ed5776053ba1c8db18bf20a9...