mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-10 16:20:17 -08:00
Code Issues Projects Releases Wiki Activity

Use libgccjit-10-dev on EMBA

Browse source 
* 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.
This commit is contained in:
Michael Albinus 2023-03-22 18:34:23 +01:00
parent 8496395653
commit db355b420b
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/infra/Dockerfile.emba
View file

@ -75,9 +75,10 @@ RUN make bootstrap
FROM emacs-base as emacs-native-comp FROM emacs-base as emacs-native-comp
# The libgccjit version must correspond to the gcc version.
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \ apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
libgccjit-6-dev \ libgccjit-10-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
FROM emacs-native-comp as emacs-native-comp-speed0 FROM emacs-native-comp as emacs-native-comp-speed0

30
test/infra/gitlab-ci.yml
View file

@ -263,23 +263,21 @@ test-filenotify-gio:
# variables: # variables:
# target: emacs-native-comp-speed1 # 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: test-native-comp-speed2:
# stage: native-comp-images stage: native-comp
# extends: [.job-template, .build-template, .native-comp-template] extends: [.job-template, .test-template, .native-comp-template]
# variables: needs:
# target: emacs-native-comp-speed2 - job: build-native-comp-speed2
optional: true
# test-native-comp-speed2: variables:
# stage: native-comp target: emacs-native-comp-speed2
# extends: [.job-template, .test-template, .native-comp-template] make_params: "-k -C test check SELECTOR='(not (tag :unstable))'"
# 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: # Local Variables:
# add-log-current-defun-header-regexp: "^\\([-_.[:alnum:]]+\\)[ \t]*:" # add-log-current-defun-header-regexp: "^\\([-_.[:alnum:]]+\\)[ \t]*:"