diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2023-03-22 18:34:23 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2023-03-22 18:34:23 +0100 |
| commit | db355b420b6d6bd3280d40f8d2b26915a7f72e02 (patch) | |
| tree | 44eaaa241619fda6a8acd51b6f7c0dfdd6a81ef6 | |
| parent | 84963956535e9eff38b0d7638ce751039eb44bc2 (diff) | |
| download | emacs-db355b420b6d6bd3280d40f8d2b26915a7f72e02.tar.gz | |
Use libgccjit-10-dev on EMBA
* test/infra/Dockerfile.emba (emacs-native-comp): Use
libgccjit-10-dev. (Bug#62211)
* test/infra/gitlab-ci.yml (build-native-comp-speed2)
(test-native-comp-speed2): Uncomment jobs.
| -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 872591333e6..d4d80d3c751 100644 --- a/test/infra/Dockerfile.emba +++ b/test/infra/Dockerfile.emba @@ -75,9 +75,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 4e11b1337b5..41778321773 100644 --- a/test/infra/gitlab-ci.yml +++ b/test/infra/gitlab-ci.yml @@ -263,23 +263,21 @@ test-filenotify-gio: # 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]*:" |