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

[Git][cmucl/cmucl][master] 2 commits: Refactor CI into stages
by Raymond Toy 05 Sep '20

05 Sep '20

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 616b30dc by Raymond Toy at 2020-09-05T20:37:58+00:00 Refactor CI into stages Refactor CI into 4 stages: install, build, test, benchmark - - - - - 932884a4 by Raymond Toy at 2020-09-05T20:37:58+00:00 Merge branch 'rtoy-refactor-ci-config' into 'master' Refactor CI in to multiple stages See merge request cmucl/cmucl!56 - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -3,54 +3,143 @@ variables: version: "2020-04-x86" bootstrap: "" -linux-runner: - artifacts: - paths: - - ansi-test/test.out - - benchmarks/cl-bench/results +stages: + - install + - build + - test + - benchmark + +cache: + + +linux:install: + stage: install tags: - linux - before_script: - - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) + 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) + +linux:build: + stage: build + tags: + - linux + artifacts: + paths: + - dist/ + needs: + - job: linux:install + artifacts: true script: - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist linux-4 + +linux:test: + stage: test + tags: + - linux + artifacts: + paths: + - ansi-test/test.out + - test.log + needs: + # Needs artifacts from build (dist/) + - job: linux:build + artifacts: true + before_script: + - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git + - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) + script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test - make LISP="../dist/bin/lisp -batch -noinit -nositeinit" - grep 'No unexpected $successes\|failures$' test.out - - cd ../benchmarks/cl-bench + +linux:benchmark: + stage: benchmark + 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-runner: - artifacts: - paths: - - ansi-test/test.out - - benchmarks/cl-bench/results +osx:install: + stage: install tags: - osx - before_script: - - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) + artifacts: + paths: + - snapshot/ + script: - curl -s -o cmucl-$version-darwin.tar.bz2 $download_url/cmucl-$version-darwin.tar.bz2 - mkdir snapshot - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2) + +osx:build: + stage: build + tags: + - osx + artifacts: + paths: + - dist/ + needs: + - job: osx:install + artifacts: true script: - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist darwin-4 + +osx:test: + stage: test + tags: + - osx + artifacts: + paths: + - ansi-test/test.out + - test.log + needs: + # Needs artifacts from build (dist/) + - job: osx:build + artifacts: true + before_script: + - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git + - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) + script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test - make LISP="../dist/bin/lisp -batch -noinit -nositeinit" - grep 'No unexpected $successes\|failures$' test.out - - cd ../benchmarks/cl-bench + +osx:benchmark: + stage: benchmark + tags: + - osx + 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 View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/09c8327acd74339e938f3f… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/09c8327acd74339e938f3f… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][rtoy-refactor-ci-config] Clone ansi-test in the test stage instead of install.
by Raymond Toy 05 Sep '20

05 Sep '20

Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: c544cad2 by Raymond Toy at 2020-09-05T13:15:54-07:00 Clone ansi-test in the test stage instead of install. Then the install stage doesn't need to save the ansi-test directory, which isn't used until the test stage anyway. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -18,11 +18,8 @@ linux:install: - linux artifacts: paths: - - ansi-test/ - snapshot/ script: - - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) - wget -nv $download_url/cmucl-$version-linux.tar.bz2 - wget -nv $download_url/cmucl-$version-linux.extra.tar.bz2 - mkdir snapshot @@ -51,10 +48,12 @@ linux:test: - ansi-test/test.out - test.log needs: - # Needs artifacts from install (ansi-test/) and build (dist/) - - job: linux:install - artifacts: true + # Needs artifacts from build (dist/) - job: linux:build + artifacts: true + before_script: + - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git + - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test @@ -86,11 +85,8 @@ osx:install: - osx artifacts: paths: - - ansi-test/ - snapshot/ script: - - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) - curl -s -o cmucl-$version-darwin.tar.bz2 $download_url/cmucl-$version-darwin.tar.bz2 - mkdir snapshot - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2) @@ -118,10 +114,12 @@ osx:test: - ansi-test/test.out - test.log needs: - # Needs artifacts from install (ansi-test/) and build (dist/) - - job: osx:install - artifacts: true + # Needs artifacts from build (dist/) - job: osx:build + artifacts: true + before_script: + - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git + - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c544cad209608ae87196c00… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c544cad209608ae87196c00… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][rtoy-refactor-ci-config] Add test.log to artifacts
by Raymond Toy 05 Sep '20

05 Sep '20

Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: ae2b154c by Raymond Toy at 2020-09-05T12:52:36-07:00 Add test.log to artifacts Save the test.log from running our testsuite to the artifacts - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -49,6 +49,7 @@ linux:test: artifacts: paths: - ansi-test/test.out + - test.log needs: # Needs artifacts from install (ansi-test/) and build (dist/) - job: linux:install @@ -115,6 +116,7 @@ osx:test: artifacts: paths: - ansi-test/test.out + - test.log needs: # Needs artifacts from install (ansi-test/) and build (dist/) - job: osx:install View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ae2b154cdeac9b09541e692… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ae2b154cdeac9b09541e692… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][rtoy-refactor-ci-config] Fix benchmark stage
by Raymond Toy 05 Sep '20

05 Sep '20

Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: 95678947 by Raymond Toy at 2020-09-05T11:41:11-07:00 Fix benchmark stage We were cd'ing to the wrong directory (because we start at the root of the build). The stage for osx:benchmark was incorrectly set to test instead of benchmark. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -73,7 +73,7 @@ linux:benchmark: artifacts: true - job: linux:build script: - - cd ../benchmarks/cl-bench + - cd benchmarks/cl-bench - mkdir tmp - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh - CMUCL=../../dist/bin/lisp ./run-cmucl.sh @@ -127,7 +127,7 @@ osx:test: - grep 'No unexpected $successes\|failures$' test.out osx:benchmark: - stage: test + stage: benchmark tags: - osx artifacts: @@ -139,7 +139,7 @@ osx:benchmark: artifacts: true - job: osx:build script: - - cd ../benchmarks/cl-bench + - cd benchmarks/cl-bench - mkdir tmp - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh - CMUCL=../../dist/bin/lisp ./run-cmucl.sh View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/956789478fdd540508f0b1e… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/956789478fdd540508f0b1e… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][rtoy-refactor-ci-config] Update test and benchmark dependencies
by Raymond Toy 05 Sep '20

05 Sep '20

Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: b2e80b1f by Raymond Toy at 2020-09-05T11:24:19-07:00 Update test and benchmark dependencies Test stage needs the artifacts from the install and build stage because it needs the ansi-test directory and the dist directory Benchmark needs the same but because it needs the snapshot directory and the dist directory so benchmarks can be run using the snapshot and the latest build. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -50,8 +50,10 @@ linux:test: paths: - ansi-test/test.out needs: - - job: linux:build + # Needs artifacts from install (ansi-test/) and build (dist/) + - job: linux:install artifacts: true + - job: linux:build script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test @@ -66,8 +68,10 @@ linux:benchmark: paths: - benchmarks/cl-bench/results needs: - - job: linux:build + # Needs artifacts from install (snapshot/) and build (dist/) + - job: linux:install artifacts: true + - job: linux:build script: - cd ../benchmarks/cl-bench - mkdir tmp @@ -112,8 +116,10 @@ osx:test: paths: - ansi-test/test.out needs: - - job: osx:build + # Needs artifacts from install (ansi-test/) and build (dist/) + - job: osx:install artifacts: true + - job: osx:build script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test @@ -128,8 +134,10 @@ osx:benchmark: paths: - benchmarks/cl-bench/results needs: - - job: osx:build + # Needs artifacts from install (snapshot/) and build (dist/) + - job: osx:install artifacts: true + - job: osx:build script: - cd ../benchmarks/cl-bench - mkdir tmp View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b2e80b1f89749dbafada6f3… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b2e80b1f89749dbafada6f3… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][rtoy-refactor-ci-config] Set up dependencies some more
by Raymond Toy 05 Sep '20

05 Sep '20

Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: 08bbf9f9 by Raymond Toy at 2020-09-05T11:06:32-07:00 Set up dependencies some more - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -49,6 +49,9 @@ linux:test: artifacts: paths: - ansi-test/test.out + needs: + - job: linux:build + artifacts: true script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test @@ -62,6 +65,9 @@ linux:benchmark: artifacts: paths: - benchmarks/cl-bench/results + needs: + - job: linux:build + artifacts: true script: - cd ../benchmarks/cl-bench - mkdir tmp @@ -105,6 +111,9 @@ osx:test: artifacts: paths: - ansi-test/test.out + needs: + - job: osx:build + artifacts: true script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test @@ -118,6 +127,9 @@ osx:benchmark: artifacts: paths: - benchmarks/cl-bench/results + needs: + - job: osx:build + artifacts: true script: - cd ../benchmarks/cl-bench - mkdir tmp View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/08bbf9f9b933cae2365c3f8… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/08bbf9f9b933cae2365c3f8… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][rtoy-refactor-ci-config] Save the dist directory
by Raymond Toy 05 Sep '20

05 Sep '20

Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: 86e84ae7 by Raymond Toy at 2020-09-05T10:52:45-07:00 Save the dist directory Needed for the test stage. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -32,13 +32,15 @@ linux:build: stage: build tags: - linux + artifacts: + paths: + - dist/ needs: - job: linux:install artifacts: true script: - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist linux-4 - - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log linux:test: stage: test @@ -48,6 +50,7 @@ linux:test: paths: - ansi-test/test.out script: + - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test - make LISP="../dist/bin/lisp -batch -noinit -nositeinit" - grep 'No unexpected $successes\|failures$' test.out @@ -85,6 +88,9 @@ osx:build: stage: build tags: - osx + artifacts: + paths: + - dist/ needs: - job: osx:install artifacts: true View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/86e84ae78910d110b475d2c… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/86e84ae78910d110b475d2c… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][rtoy-refactor-ci-config] Fix typo in osx:build
by Raymond Toy 05 Sep '20

05 Sep '20

Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: c56210cd by Raymond Toy at 2020-09-05T10:38:16-07:00 Fix typo in osx:build Stage was "install", but should have benn "build". - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -82,7 +82,7 @@ osx:install: - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2) osx:build: - stage: install + stage: build tags: - osx needs: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c56210cd8302c9357225282… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c56210cd8302c9357225282… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][rtoy-refactor-ci-config] Set up artifacts between install and build
by Raymond Toy 05 Sep '20

05 Sep '20

Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: e6dc62db by Raymond Toy at 2020-09-05T10:32:55-07:00 Set up artifacts between install and build In the build stage, keep the ansi-test and snapshot directories around because we need that for running the tests. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -9,11 +9,17 @@ stages: - test - benchmark +cache: + linux:install: stage: install tags: - linux + artifacts: + paths: + - ansi-test/ + - snapshot/ script: - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) @@ -26,6 +32,9 @@ linux:build: stage: build tags: - linux + needs: + - job: linux:install + artifacts: true script: - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist linux-4 @@ -61,6 +70,10 @@ osx:install: stage: install tags: - osx + artifacts: + paths: + - ansi-test/ + - snapshot/ script: - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) @@ -72,6 +85,9 @@ osx:build: stage: install tags: - osx + needs: + - job: osx:install + artifacts: true script: - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist darwin-4 View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e6dc62dba11e1b09cd37b22… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e6dc62dba11e1b09cd37b22… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch rtoy-refactor-ci-config
by Raymond Toy 05 Sep '20

05 Sep '20

Raymond Toy pushed new branch rtoy-refactor-ci-config at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/rtoy-refactor-ci-config You're receiving this email because of your account on gitlab.common-lisp.net.

1 0