diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2023-03-23 06:30:13 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-03-23 06:30:13 +0100 |
| commit | 90dca0a533707813b925bc6f9987ccf8e5318985 (patch) | |
| tree | 4e49a52fedbf8da3f22ab50948dcc0ae289c5ca4 /test/infra | |
| parent | e11813d574db1297a9b33ec2a4cba4dc3c6a16af (diff) | |
| parent | 6de00e4df99e3b4803b2c60c4981d13e30dbf3ff (diff) | |
| download | emacs-90dca0a533707813b925bc6f9987ccf8e5318985.tar.gz | |
Merge from origin/emacs-29
6de00e4df99 ; Fix xref-match's :version since the default value did c...
db355b420b6 Use libgccjit-10-dev on EMBA
84963956535 * lisp/outline.el (outline--fix-buttons-after-change): Ad...
3d3bbaace69 Align concatenated strings to the first sibling in c-ts-mode
f856468e457 Only fill the current paragraph in c-ts-common--fill-bloc...
df669c5a11f Add missing indent rule for c-ts-mode
Diffstat (limited to 'test/infra')
| -rw-r--r-- | test/infra/Dockerfile.emba | 3 | ||||
| -rw-r--r-- | test/infra/gitlab-ci.yml | 30 |
2 files changed, 16 insertions, 17 deletions
diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba index 7451c727624..adca95eb209 100644 --- a/test/infra/Dockerfile.emba +++ b/test/infra/Dockerfile.emba @@ -86,9 +86,10 @@ RUN make bootstrap FROM emacs-base as emacs-native-comp +# The libgccjit version must correspond to the gcc version. RUN apt-get update && \ apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \ - libgccjit-6-dev \ + libgccjit-10-dev \ && rm -rf /var/lib/apt/lists/* FROM emacs-native-comp as emacs-native-comp-speed0 diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml index b2d52117ba4..b000f128278 100644 --- a/test/infra/gitlab-ci.yml +++ b/test/infra/gitlab-ci.yml @@ -290,23 +290,21 @@ test-eglot: # variables: # target: emacs-native-comp-speed1 -# The next two jobs are commented out due to bug#62211. - -# build-native-comp-speed2: -# stage: native-comp-images -# extends: [.job-template, .build-template, .native-comp-template] -# variables: -# target: emacs-native-comp-speed2 +build-native-comp-speed2: + stage: native-comp-images + extends: [.job-template, .build-template, .native-comp-template] + variables: + target: emacs-native-comp-speed2 -# test-native-comp-speed2: -# stage: native-comp -# extends: [.job-template, .test-template, .native-comp-template] -# needs: -# - job: build-native-comp-speed2 -# optional: true -# variables: -# target: emacs-native-comp-speed2 -# make_params: "-k -C test check SELECTOR='(not (tag :unstable))'" +test-native-comp-speed2: + stage: native-comp + extends: [.job-template, .test-template, .native-comp-template] + needs: + - job: build-native-comp-speed2 + optional: true + variables: + target: emacs-native-comp-speed2 + make_params: "-k -C test check SELECTOR='(not (tag :unstable))'" # Local Variables: # add-log-current-defun-header-regexp: "^\\([-_.[:alnum:]]+\\)[ \t]*:" |