; * test/infra/gitlab-ci.yml: Merge test-template script into job-template.
This commit is contained in:
parent
1fe135a024
commit
372694e7c6
1 changed files with 5 additions and 6 deletions
|
@ -94,6 +94,11 @@ default:
|
|||
paths: []
|
||||
# - "test/**/*.log"
|
||||
# - "**/*.log"
|
||||
# using the variables for each job
|
||||
script:
|
||||
- docker pull ${CI_REGISTRY_IMAGE}:${target}-${CI_COMMIT_SHA}
|
||||
# TODO: with make -j4 several of the tests were failing, for example shadowfile-tests, but passed without it
|
||||
- docker run -i --rm -e EMACS_EMBA_CI=${EMACS_EMBA_CI} ${CI_REGISTRY_IMAGE}:${target}-${CI_COMMIT_SHA} make ${make_params}
|
||||
|
||||
.build-template:
|
||||
script:
|
||||
|
@ -127,12 +132,6 @@ default:
|
|||
- test/lisp/autorevert-tests.el
|
||||
- test/lisp/filenotify-tests.el
|
||||
|
||||
# using the variables for each job
|
||||
script:
|
||||
- docker pull ${CI_REGISTRY_IMAGE}:${target}-${CI_COMMIT_SHA}
|
||||
# TODO: with make -j4 several of the tests were failing, for example shadowfile-tests, but passed without it
|
||||
- docker run -i --rm -e EMACS_EMBA_CI=${EMACS_EMBA_CI} ${CI_REGISTRY_IMAGE}:${target}-${CI_COMMIT_SHA} make ${make_params}
|
||||
|
||||
stages:
|
||||
- prep-images
|
||||
- build-images
|
||||
|
|
Loading…
Add table
Reference in a new issue