Skip to content

Commit b3213f8

Browse files
apply another change to Docker images
1 parent 0c88f10 commit b3213f8

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

.github/ciimage/Dockerfile.archlinux

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ RUN pacman -Syu --noconfirm && \
1818
python-pip \
1919
git \
2020
meson \
21-
ninja && \
21+
ninja \
22+
tzdata && \
2223
pacman -Scc --noconfirm
2324

2425
# Set environment variables

.github/ciimage/Dockerfile.debian

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use the latest Debian base image
2-
FROM debian:latest
2+
FROM debian:bullseye
33

44
# Set environment variables to avoid interaction
55
ENV DEBIAN_FRONTEND=noninteractive \
@@ -28,7 +28,7 @@ RUN apt-get update && \
2828
rm -rf /var/lib/apt/lists/*
2929

3030
# Install Meson and Ninja
31-
RUN python3 -m pip install --no-cache-dir meson==1.3.0 ninja==1.10.2
31+
RUN apt-get update && python3 -m pip install --no-cache-dir meson==1.3.0 ninja==1.10.2
3232

3333
# Set environment variables
3434
ENV CC=/usr/bin/clang

.github/ciimage/Dockerfile.fedora

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ENV TZ=UTC
66

77
# Install system dependencies and clean up
88
RUN dnf -y update && \
9+
dnf -y groupinstall "Development Tools" && \
910
dnf install -y \
1011
gcc \
1112
gcc-c++ \
@@ -19,9 +20,8 @@ RUN dnf -y update && \
1920
python3-pip \
2021
git && \
2122
dnf clean all
22-
2323
# Install Meson and Ninja using pip
24-
RUN python3 -m pip install --no-cache-dir meson==1.3.0 ninja==1.10.2
24+
RUN python3 -m pip install --no-cache-dir meson ninja
2525

2626
# Set environment variables
2727
ENV CC=/usr/bin/clang

.github/ciimage/Dockerfile.ubuntu

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ RUN apt-get update && \
2424
wget \
2525
python3 \
2626
python3-pip \
27-
git && \
27+
git \
28+
tzdata && \
2829
apt-get clean && \
2930
rm -rf /var/lib/apt/lists/*
3031

31-
# Install Meson, Ninja, and Cython using pip
32-
RUN python3 -m pip install --no-cache-dir meson==1.3.0 ninja==1.10.2
32+
RUN python3 -m pip install --no-cache-dir meson ninja
3333

3434
# Set environment variables
3535
ENV CC=/usr/bin/gcc

code/logic/testing.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ const char *timeout_messages[] = {
281281

282282
jmp_buf test_jump_buffer; // This will hold the jump buffer for longjmp
283283

284-
285284
// Custom implementation of strdup to avoid warnings on some platforms
286285
char *_custom_fossil_test_strdup(const char *str) {
287286
size_t len = strlen(str) + 1;

0 commit comments

Comments
 (0)