diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 514a2456fa4bb2c7ede6eafd49f5fde8a851fe67..8aca9b8bb992606b5eccc64ac2197c0a94210bbc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,96 +1,24 @@ -# Lifted from @etimmons' script for ASDF -############################################################################### -# Global configuration -############################################################################### +include: + project: 'clci/gitlab-ci' + ref: release/v2-dev + file: + - definitions.gitlab-ci.yml + - test-pipeline.gitlab-ci.yml + - release-pipeline.gitlab-ci.yml + +# This section is not strictly required, but prevents Gitlab CI from launching +# multiple redundent pipelines when a Merge Request is opened. +workflow: + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS' + when: never + - if: '$CI_COMMIT_BRANCH' + - if: '$CI_COMMIT_TAG' variables: - # Just let the runner fetch and update the submodules for us. GIT_SUBMODULE_STRATEGY: normal - ABCL_IMAGE: clfoundation/abcl - ABCL_TAG: latest - CCL_IMAGE: clfoundation/ccl - CCL_TAG: latest - CLASP_IMAGE: clfoundation/clasp - CLASP_TAG: latest - CLISP_IMAGE: clfoundation/clisp - CLISP_TAG: latest - CMUCL_IMAGE: clfoundation/cmucl - CMUCL_TAG: latest - ECL_IMAGE: clfoundation/ecl - ECL_TAG: latest - SBCL_IMAGE: clfoundation/sbcl - SBCL_TAG: latest - - -# This causes pipelines to be created only on the default branch, tags, merge -# requests, and when triggered via the web interface. -# workflow: -# rules: -# - if: $CI_MERGE_REQUEST_IID -# - if: $CI_COMMIT_TAG -# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -# - if: $CI_COMMIT_BRANCH == "fix-asdf-test-op" -# - if: $CI_PIPELINE_SOURCE == "web" - -stages: - - regression - -############################################################################### -# Testing Templates -############################################################################### - -.Regression tests: - stage: regression - script: - - make test - artifacts: - paths: - - build/results/$l-test.text - needs: [] - -############################################################################### -# Actual test jobs - Makefile based harness -############################################################################### - -ABCL regression tests: - extends: .Regression tests - image: $ABCL_IMAGE:$ABCL_TAG - variables: - l: abcl - -CCL regression tests: - extends: .Regression tests - image: $CCL_IMAGE:$CCL_TAG - variables: - l: ccl - -Clasp regression tests: - extends: .Regression tests - image: $CLASP_IMAGE:$CLASP_TAG - variables: - l: clasp - -# dropping because I don't have access to an image with ASDF installed. -# CLISP regression tests: -# extends: .Regression tests -# image: $CLISP_IMAGE:$CLISP_TAG -# variables: -# l: clisp - -CMUCL regression tests: - extends: .Regression tests - image: $CMUCL_IMAGE:$CMUCL_TAG - variables: - l: cmucl - -ECL regression tests: - extends: .Regression tests - image: $ECL_IMAGE:$ECL_TAG - variables: - l: ecl - -SBCL regression tests: - extends: .Regression tests - image: $SBCL_IMAGE:$SBCL_TAG - variables: - l: sbcl + CLCI_CHANGELOG: "Changelog.md" + # Clasp isn't enabled by default (yet). + CLCI_TEST_CLASP: "yes" + CLCI_TEST_SCRIPT: "test-ci.lisp" diff --git a/Changelog.md b/Changelog.md index 6c99a1a068d94209883c28dbba1c9c0b0d0b2b72..0694563973b1bd5ef5008fb89ee918e94efc8df1 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,8 +1,7 @@ -# Changelog +# Iterate Changelog This changelog has a great deal of catch-up still to be done, but rather than further postponing its creation, we are just going to start here. -| Version | Date | Description | -|---------|------------------|---------------------------------------------------------| -| 1.5.3 | [2021-05-23 Sun] | Deprecate the use of `count` as synonym for `counting`. | -| | | | +## v1.5.3 - 2021-05-23 Sun + +Deprecate the use of `count` as synonym for `counting`. diff --git a/test-ci.lisp b/test-ci.lisp new file mode 100644 index 0000000000000000000000000000000000000000..15086401fcf5de0fea04dc42bab6ba296123c253 --- /dev/null +++ b/test-ci.lisp @@ -0,0 +1,5 @@ +(in-package :common-lisp-user) + +(require "asdf") + +(load "test-common.lisp") diff --git a/test-common.lisp b/test-common.lisp new file mode 100644 index 0000000000000000000000000000000000000000..343e28c4f6915d1ff889877e8b3d20149ba1475e --- /dev/null +++ b/test-common.lisp @@ -0,0 +1,38 @@ +(in-package :common-lisp-user) + +(asdf:load-asd (merge-pathnames (make-pathname + :name "iterate" + :type "asd") + *load-truename*)) + +(format t "~&Successfully loaded the iterate ASD file.~%") + +#-sbcl +(asdf:load-asd (merge-pathnames (make-pathname + :name "rt" + :type "asd" + :directory + '(:relative "ext" "rt")) + *load-truename*)) + + +(if (not (asdf:find-system "iterate")) + (progn + (format t "~&Unable to find the iterate ASDF system definition.~%") + (uiop:quit 1)) + (format t "~&Found iterate ASDF system definition.~%")) + + + +(asdf:load-system "iterate/tests") + +(handler-bind ((iterate.test::unexpected-failures-error + #'(lambda (e) + (declare (ignorable e)) + (format t "~&Catching unexpected failures error.~%") + (uiop:quit 2))) + (error #'(lambda (e) + (format t "~&Caught unexpected error ~a~%" e) + (uiop:quit 3)))) + (asdf:test-system "iterate") + (uiop:quit 0)) diff --git a/test.lisp b/test.lisp index 21b2d3fe2041c979ae1c6d51fcd16121ae0d612c..5ca7b8669996d9c93401f5a8307846e63a431a8f 100644 --- a/test.lisp +++ b/test.lisp @@ -1,6 +1,6 @@ (in-package :common-lisp-user) -(require :asdf) +(require "asdf") (asdf:initialize-output-translations `(:output-translations @@ -11,39 +11,4 @@ :ignore-inherited-configuration )) -(asdf:load-asd (merge-pathnames (make-pathname - :name "iterate" - :type "asd") - *load-truename*)) - -(format t "~&Successfully loaded the iterate ASD file.~%") - -#-sbcl -(asdf:load-asd (merge-pathnames (make-pathname - :name "rt" - :type "asd" - :directory - '(:relative "ext" "rt")) - *load-truename*)) - - -(if (not (asdf:find-system "iterate")) - (progn - (format t "~&Unable to find the iterate ASDF system definition.~%") - (uiop:quit 1)) - (format t "~&Found iterate ASDF system definition.~%")) - - - -(asdf:load-system "iterate/tests") - -(handler-bind ((iterate.test::unexpected-failures-error - #'(lambda (e) - (declare (ignorable e)) - (format t "~&Catching unexpected failures error.~%") - (uiop:quit 2))) - (error #'(lambda (e) - (format t "~&Caught unexpected error ~a~%" e) - (uiop:quit 3)))) - (asdf:test-system "iterate") - (uiop:quit 0)) +(load "test-common.lisp")