mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 17:24:23 +00:00
; Fix last change
This commit is contained in:
parent
75870a7ad1
commit
b589fa9e23
1 changed files with 19 additions and 19 deletions
|
|
@ -84,25 +84,25 @@ default:
|
|||
script:
|
||||
- docker pull ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG}
|
||||
- 'export PWD=$(pwd)'
|
||||
- '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` \
|
||||
-e http_proxy=${http_proxy} \
|
||||
-e https_proxy=${https_proxy} \
|
||||
-e no_proxy=${no_proxy} \
|
||||
--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 && \
|
||||
- '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`
|
||||
-e http_proxy=${http_proxy}
|
||||
-e https_proxy=${https_proxy}
|
||||
-e no_proxy=${no_proxy}
|
||||
--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
|
||||
|
|
|
|||
Loading…
Reference in a new issue