[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 db355b420b6: Use libgccjit-10-dev on EMBA
From: |
Michael Albinus |
Subject: |
emacs-29 db355b420b6: Use libgccjit-10-dev on EMBA |
Date: |
Wed, 22 Mar 2023 13:35:11 -0400 (EDT) |
branch: emacs-29
commit db355b420b6d6bd3280d40f8d2b26915a7f72e02
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
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.
---
test/infra/Dockerfile.emba | 3 ++-
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]*:"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-29 db355b420b6: Use libgccjit-10-dev on EMBA,
Michael Albinus <=