diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2021-03-27 20:14:22 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2021-03-27 20:14:22 +0100 |
| commit | c52cf64adb0e47c9179f00e00a8980e86b864abd (patch) | |
| tree | c46670502b00e9896424801ebb728ac30127b16d /test | |
| parent | 547960488dbcba72864cf86ccf9a6efb7d4cb11b (diff) | |
| download | emacs-c52cf64adb0e47c9179f00e00a8980e86b864abd.tar.gz | |
; Adapt recent change in test/infra/gitlab-ci.yml
Diffstat (limited to 'test')
| -rw-r--r-- | test/infra/gitlab-ci.yml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml index 91315ad21d6..fdca12b27aa 100644 --- a/test/infra/gitlab-ci.yml +++ b/test/infra/gitlab-ci.yml @@ -104,7 +104,10 @@ default: - 'export PWD=$(pwd)' - 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} --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 -c "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 -j4 && make ${make_params}"' after_script: - - 'docker rm ${test_name}' + - docker ps -a + - printenv + - [ ${CI_JOB_STAGE} == fast ] && ( mkdir test-${test_name}; docker cp ${test_name}:test test-${test_name} ) || true + - docker rm ${test_name} .build-template: rules: @@ -136,10 +139,6 @@ default: - docker push ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} .test-template: - script: - - mkdir test-${test_name} - - docker ps -a - - docker cp ${test_name}:test test-${test_name} artifacts: name: ${test_name} public: true |