aboutsummaryrefslogtreecommitdiffstats
path: root/test/infra
diff options
context:
space:
mode:
authorMichael Albinus2024-10-03 16:41:40 +0200
committerMichael Albinus2024-10-03 16:41:40 +0200
commit042eee61ee2dee3732ffc8c4d30a75fa4751f844 (patch)
treec780596931f5d9d6b468adb296d6bde0c72a80cf /test/infra
parent8683d64cc571500347a16e7cb7d144d723250489 (diff)
downloademacs-042eee61ee2dee3732ffc8c4d30a75fa4751f844.tar.gz
emacs-042eee61ee2dee3732ffc8c4d30a75fa4751f844.zip
; Fix last change in gitlab-ci.yml
Diffstat (limited to 'test/infra')
-rw-r--r--test/infra/gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index b99fb878f02..de70e10870f 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -87,7 +87,7 @@ default:
87 - '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}"' 87 - '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}"'
88 after_script: 88 after_script:
89 # - docker ps -a 89 # - docker ps -a
90 ' - pwd; printenv 90 # - pwd; printenv
91 # - test -n "$(docker ps -aq -f name=${test_name})" && ( docker export ${test_name} | tar -tvf - ) 91 # - test -n "$(docker ps -aq -f name=${test_name})" && ( docker export ${test_name} | tar -tvf - )
92 # Prepare test artifacts. 92 # Prepare test artifacts.
93 - test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/test ${test_name} 93 - test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/test ${test_name}