; Fix last change

(cherry picked from commit b589fa9e23d896ce76b64016e0a5750f2131c393)

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index d50c6193a73edcde463346c9d227461e1bb559cf..a0666550030c2b3edbff0dbc9f73e3a4393f6ab4 100644 (file)
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -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