diff options
Diffstat (limited to 'test/infra/gitlab-ci.yml')
| -rw-r--r-- | test/infra/gitlab-ci.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml index 1f0f33bbe86..23af677d186 100644 --- a/test/infra/gitlab-ci.yml +++ b/test/infra/gitlab-ci.yml | |||
| @@ -90,7 +90,6 @@ default: | |||
| 90 | -e EMACS_TEST_JUNIT_REPORT=${EMACS_TEST_JUNIT_REPORT} | 90 | -e EMACS_TEST_JUNIT_REPORT=${EMACS_TEST_JUNIT_REPORT} |
| 91 | -e EMACS_TEST_TIMEOUT=${EMACS_TEST_TIMEOUT} | 91 | -e EMACS_TEST_TIMEOUT=${EMACS_TEST_TIMEOUT} |
| 92 | -e EMACS_TEST_VERBOSE=${EMACS_TEST_VERBOSE} | 92 | -e EMACS_TEST_VERBOSE=${EMACS_TEST_VERBOSE} |
| 93 | -e NPROC=`nproc` | ||
| 94 | -e http_proxy=${http_proxy} | 93 | -e http_proxy=${http_proxy} |
| 95 | -e https_proxy=${https_proxy} | 94 | -e https_proxy=${https_proxy} |
| 96 | -e no_proxy=${no_proxy} | 95 | -e no_proxy=${no_proxy} |
| @@ -104,8 +103,8 @@ default: | |||
| 104 | git diff --name-only FETCH_HEAD && | 103 | git diff --name-only FETCH_HEAD && |
| 105 | ( git diff --name-only FETCH_HEAD | | 104 | ( git diff --name-only FETCH_HEAD | |
| 106 | xargs git checkout -f FETCH_HEAD ) && | 105 | xargs git checkout -f FETCH_HEAD ) && |
| 107 | make -j \$NPROC && | 106 | make && |
| 108 | make -k -j \$NPROC ${make_params}"' | 107 | make -k ${make_params}"' |
| 109 | after_script: | 108 | after_script: |
| 110 | # - docker ps -a | 109 | # - docker ps -a |
| 111 | # - pwd; printenv | 110 | # - pwd; printenv |