1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00

; Backport gitlab-ci.yml from master (don't merge)

* test/infra/gitlab-ci.yml (.job-template): Remove cache:policy.
(.build-template, .test-template): Add job specific cache:policy.
(.tree-sitter-template): Adapt changes.
This commit is contained in:
Michael Albinus 2024-08-14 09:47:59 +02:00
parent 4589f51c21
commit 7c588a0065

View File

@ -75,7 +75,6 @@ default:
cache:
key: ${CI_COMMIT_SHA}
paths: []
policy: pull-push
# These will be saved for followup builds.
artifacts:
expire_in: 24 hrs
@ -83,8 +82,6 @@ default:
# Using the variables for each job.
script:
- docker pull ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG}
# TODO: with make -j4 several of the tests were failing, for
# example shadowfile-tests, but passed without it.
- '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` --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:
@ -101,6 +98,8 @@ default:
.build-template:
needs: []
cache:
policy: push
rules:
- if: '$CI_PIPELINE_SOURCE == "web"'
when: always
@ -131,6 +130,8 @@ default:
- docker push ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG}
.test-template:
cache:
policy: pull
artifacts:
name: ${test_name}
public: true
@ -183,14 +184,18 @@ default:
- if: '$CI_PIPELINE_SOURCE == "schedule"'
changes:
- "**.in"
- lisp/align.el
- lisp/progmodes/*-ts-mode.el
- lisp/progmodes/csharp-mode.el
- lisp/progmodes/js.el
- lisp/progmodes/python.el
- lisp/textmodes/*-ts-mode.el
- src/treesit.{h,c}
- test/infra/*
- test/lisp/align-tests.el
- test/lisp/progmodes/*-ts-mode-resources/**
- test/lisp/progmodes/*-ts-mode-tests.el
- test/lisp/progmodes/csharp-mode-tests.el
- test/lisp/progmodes/js-tests.el
- test/lisp/progmodes/python-tests.el
- test/lisp/textmodes/*-ts-mode-resources/**