mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-06 03:40:56 -08:00
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
This commit is contained in:
commit
1aeec0db7d
1 changed files with 3 additions and 3 deletions
|
|
@ -87,8 +87,8 @@ default:
|
|||
- 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} -e EMACS_TEST_JUNIT_REPORT=${EMACS_TEST_JUNIT_REPORT} -e EMACS_TEST_TIMEOUT=${EMACS_TEST_TIMEOUT} -e EMACS_TEST_VERBOSE=${EMACS_TEST_VERBOSE} -e NPROC=`nproc` --volumes-from $(docker ps -q -f "label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}"):ro --name ${test_name} ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} /bin/bash -xvc "git fetch ${PWD} HEAD && echo checking out these updated files && git diff --name-only FETCH_HEAD && ( git diff --name-only FETCH_HEAD | xargs git checkout -f FETCH_HEAD ) && make -j \$NPROC && make -k -j \$NPROC ${make_params}"'
|
||||
after_script:
|
||||
# - docker ps -a
|
||||
- pwd; printenv
|
||||
- test -n "$(docker ps -aq -f name=${test_name})" && ( docker export ${test_name} | tar -tvf - )
|
||||
' - pwd; printenv
|
||||
# - test -n "$(docker ps -aq -f name=${test_name})" && ( docker export ${test_name} | tar -tvf - )
|
||||
# Prepare test artifacts.
|
||||
- test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/test ${test_name}
|
||||
- test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/configure.log ${test_name}
|
||||
|
|
@ -134,7 +134,7 @@ default:
|
|||
expire_in: 1 week
|
||||
when: always
|
||||
paths:
|
||||
- "${test_name}/**.log"
|
||||
- ${test_name}/
|
||||
reports:
|
||||
junit: ${test_name}/${EMACS_TEST_JUNIT_REPORT}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue