Skip to content

Add TBB for gcc and fix unzip on vcpkg #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
duncanspumpkin merged 2 commits into from
Jan 9, 2026
+122 −1
Merged

Add TBB for gcc and fix unzip on vcpkg #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc7976d
Add TBB for gcc and fix unzip on vcpkg
duncanspumpkin Jan 8, 2026
b701f8e
Revert changing fedora version remove noble32 libtbb
duncanspumpkin Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
matrix:
# Remember if you commit this, newly built images will replace those tags.
# Prefer incrementing the version to unused one
tag: [9-mingw32, 9-jammy32, 9-noble32, 9-noble32vcpkg]
tag: [10-mingw32, 10-jammy, 10-jammy32, 10-noble, 10-noble32, 10-noblevcpkg]
env:
dockertag: ${{ matrix.tag }}
REGISTRY: ghcr.io
Expand Down
22 changes: 22 additions & 0 deletions 10/jammy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM ubuntu:22.04

ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get -y upgrade \
&& apt-get install --no-install-recommends -y \
ca-certificates \
ccache \
clang \
cmake \
g++-multilib \
gcc-multilib \
git \
libgtest-dev \
libtbb-dev \
libopenal-dev \
libpng-dev \
libsdl2-dev \
ninja-build \
pkg-config \
&& update-ca-certificates \
&& rm -rf /var/lib/apt/lists/*
23 changes: 23 additions & 0 deletions 10/jammy32/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
FROM ubuntu:22.04

ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get -y upgrade \
&& apt-get install --no-install-recommends -y \
ca-certificates \
ccache \
clang \
cmake \
g++-multilib \
gcc-multilib \
git \
libgtest-dev:i386 \
libtbb-dev:i386 \
libopenal-dev:i386 \
libpng-dev:i386 \
libsdl2-dev:i386 \
ninja-build \
pkg-config:i386 \
&& update-ca-certificates \
&& rm -rf /var/lib/apt/lists/*
4 changes: 4 additions & 0 deletions 10/mingw32/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM fedora:41
Copy link
Copy Markdown
Member

@AaronVanGeffen AaronVanGeffen Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fedora 41 is EOL; let's push this to 43 while we're at it.

Copy link
Copy Markdown
Member

@AaronVanGeffen AaronVanGeffen Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just saw OpenLoco/OpenLoco#3608 (comment). That sucks.

Copy link
Copy Markdown
Contributor Author

@duncanspumpkin duncanspumpkin Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fedora 43 doesn't have sdl2

Copy link
Copy Markdown
Member

@AaronVanGeffen AaronVanGeffen Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hang on, wouldn't sdl2-compat work still?

RUN dnf update -y && \
dnf install -y mingw32-gcc-c++ mingw32-SDL2 mingw32-SDL2-static ccache cmake git ninja-build dnf-plugins-core mingw32-yaml-cpp mingw32-libpng mingw32-openal-soft && \
dnf clean all --enablerepo=\*
23 changes: 23 additions & 0 deletions 10/noble/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
FROM ubuntu:24.04

ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get -y upgrade \
&& apt-get install --no-install-recommends -y \
ca-certificates \
ccache \
clang \
clang-tidy \
cmake \
g++-multilib \
gcc-multilib \
git \
libgtest-dev \
libtbb-dev \
libopenal-dev \
libpng-dev \
libsdl2-dev \
ninja-build \
pkg-config \
&& update-ca-certificates \
&& rm -rf /var/lib/apt/lists/*
23 changes: 23 additions & 0 deletions 10/noble32/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
FROM ubuntu:24.04

ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get -y upgrade \
&& apt-get install --no-install-recommends -y \
ca-certificates \
ccache \
clang \
clang-tidy \
cmake \
g++-multilib \
gcc-multilib \
git \
libgtest-dev:i386 \
libopenal-dev:i386 \
libpng-dev:i386 \
libsdl2-dev:i386 \
ninja-build \
pkg-config:i386 \
&& update-ca-certificates \
&& rm -rf /var/lib/apt/lists/*
26 changes: 26 additions & 0 deletions 10/noblevcpkg/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM ubuntu:24.04

ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get -y upgrade \
&& apt-get install --no-install-recommends -y \
autoconf \
automake \
ca-certificates \
ccache \
clang \
clang-tidy \
cmake \
curl \
g++-multilib \
gcc-multilib \
git \
libtool \
make \
ninja-build \
zip \
unzip \
pkg-config:i386 \
&& update-ca-certificates \
&& rm -rf /var/lib/apt/lists/*