Skip to content

Commit 907a672

Browse files
committed
Merge #1313: ci: Test on development snapshots of GCC and Clang
981e5be ci: Fix typo in comment (Tim Ruffing) e9e9648 ci: Reduce number of macOS tasks from 28 to 8 (Tim Ruffing) 609093b ci: Add x86_64 Linux tasks for gcc and clang snapshots (Tim Ruffing) 1deecaa ci: Install development snapshots of gcc and clang (Tim Ruffing) Pull request description: ACKs for top commit: hebasto: re-ACK 981e5be jonasnick: ACK 981e5be Tree-SHA512: a36ef6f3c30a7f6e09e186e67b8eeb6e16e05de3bd97f21342866e75e33275103d463b6a12603ce235da7e26e4acdef4d811f62f369f18db9ac4e7ff06749136
2 parents 0f7657d + 981e5be commit 907a672

File tree

2 files changed

+51
-10
lines changed

2 files changed

+51
-10
lines changed

.cirrus.yml

+15-8
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ linux_container_snippet: &LINUX_CONTAINER
6262
# Gives us more CPUs for free if they're available.
6363
greedy: true
6464
# More than enough for our scripts.
65-
memory: 1G
65+
memory: 2G
6666

6767
task:
6868
name: "x86_64: Linux (Debian stable)"
6969
<< : *LINUX_CONTAINER
70-
matrix: &ENV_MATRIX
70+
matrix:
7171
- env: {WIDEMUL: int64, RECOVERY: yes}
7272
- env: {WIDEMUL: int64, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes}
7373
- env: {WIDEMUL: int128}
@@ -88,6 +88,10 @@ task:
8888
CC: gcc
8989
- env:
9090
CC: clang
91+
- env:
92+
CC: gcc-snapshot
93+
- env:
94+
CC: clang-snapshot
9195
test_script:
9296
- ./ci/cirrus.sh
9397
<< : *CAT_LOGS
@@ -118,17 +122,20 @@ task:
118122
HOMEBREW_NO_INSTALL_CLEANUP: 1
119123
# Cirrus gives us a fixed number of 4 virtual CPUs. Not that we even have that many jobs at the moment...
120124
MAKEFLAGS: -j5
121-
matrix:
122-
<< : *ENV_MATRIX
123125
env:
124126
ASM: no
125127
WITH_VALGRIND: no
126128
CTIMETESTS: no
129+
CC: clang
127130
matrix:
128-
- env:
129-
CC: gcc
130-
- env:
131-
CC: clang
131+
- env: {WIDEMUL: int64, RECOVERY: yes, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes}
132+
- env: {WIDEMUL: int64, RECOVERY: yes, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes, CC: gcc}
133+
- env: {WIDEMUL: int128_struct, ECMULTGENPRECISION: 2, ECMULTWINDOW: 4}
134+
- env: {WIDEMUL: int128, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes}
135+
- env: {WIDEMUL: int128, RECOVERY: yes, SCHNORRSIG: yes}
136+
- env: {WIDEMUL: int128, RECOVERY: yes, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes, CC: gcc}
137+
- env: {WIDEMUL: int128, RECOVERY: yes, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes, CPPFLAGS: -DVERIFY}
138+
- env: {BUILD: distcheck}
132139
brew_script:
133140
- brew install automake libtool gcc
134141
test_script:

ci/linux-debian.Dockerfile

+36-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM debian:stable
22

3+
SHELL ["/bin/bash", "-c"]
4+
35
RUN dpkg --add-architecture i386 && \
46
dpkg --add-architecture s390x && \
57
dpkg --add-architecture armhf && \
@@ -9,7 +11,7 @@ RUN dpkg --add-architecture i386 && \
911
# dkpg-dev: to make pkg-config work in cross-builds
1012
# llvm: for llvm-symbolizer, which is used by clang's UBSan for symbolized stack traces
1113
RUN apt-get update && apt-get install --no-install-recommends -y \
12-
git ca-certificates \
14+
git ca-certificates wget \
1315
make automake libtool pkg-config dpkg-dev valgrind qemu-user \
1416
gcc clang llvm libclang-rt-dev libc6-dbg \
1517
g++ \
@@ -23,7 +25,39 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
2325
sagemath
2426

2527
WORKDIR /root
26-
# The "wine" package provides a convience wrapper that we need
28+
29+
# Build and install gcc snapshot
30+
ARG GCC_SNAPSHOT_MAJOR=14
31+
RUN wget --progress=dot:giga --https-only --recursive --accept '*.tar.xz' --level 1 --no-directories "https://gcc.gnu.org/pub/gcc/snapshots/LATEST-${GCC_SNAPSHOT_MAJOR}" && \
32+
wget "https://gcc.gnu.org/pub/gcc/snapshots/LATEST-${GCC_SNAPSHOT_MAJOR}/sha512.sum" && \
33+
sha512sum --check --ignore-missing sha512.sum && \
34+
# We should have downloaded exactly one tar.xz file
35+
ls && \
36+
[[ $(ls *.tar.xz | wc -l) -eq "1" ]] && \
37+
tar xf *.tar.xz && \
38+
mkdir gcc-build && cd gcc-build && \
39+
apt-get update && apt-get install --no-install-recommends -y libgmp-dev libmpfr-dev libmpc-dev flex && \
40+
../*/configure --prefix=/opt/gcc-snapshot --enable-languages=c --disable-bootstrap --disable-multilib --without-isl && \
41+
make -j $(nproc) && \
42+
make install && \
43+
ln -s /opt/gcc-snapshot/bin/gcc /usr/bin/gcc-snapshot
44+
45+
# Install clang snapshot
46+
RUN wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
47+
# Add repository for this Debian release
48+
. /etc/os-release && echo "deb http://apt.llvm.org/${VERSION_CODENAME} llvm-toolchain-${VERSION_CODENAME} main" >> /etc/apt/sources.list && \
49+
# Install clang snapshot
50+
apt-get update && apt-get install --no-install-recommends -y clang && \
51+
# Remove just the "clang" symlink again
52+
apt-get remove -y clang && \
53+
# We should have exactly two clang versions now
54+
ls /usr/bin/clang* && \
55+
[[ $(ls /usr/bin/clang-?? | sort | wc -l) -eq "2" ]] && \
56+
# Create symlinks for them
57+
ln -s $(ls /usr/bin/clang-?? | sort | tail -1) /usr/bin/clang-snapshot && \
58+
ln -s $(ls /usr/bin/clang-?? | sort | head -1) /usr/bin/clang
59+
60+
# The "wine" package provides a convenience wrapper that we need
2761
RUN apt-get update && apt-get install --no-install-recommends -y \
2862
git ca-certificates wine64 wine python3-simplejson python3-six msitools winbind procps && \
2963
# Workaround for `wine` package failure to employ the Debian alternatives system properly.

0 commit comments

Comments
 (0)