Add Version 20 with zstd#21
Conversation
LRFLEW
force-pushed
the
zstd
branch
4 times, most recently
from
b631dc1 to
dc4de4f
Compare
| @@ -0,0 +1,3 @@ | |||
| # Image specifically designed to run clang-format on OpenRCT2 source files. | |||
| FROM alpine | |||
| RUN apk add --no-cache python3 clang19-extra-tools | |||
There was a problem hiding this comment.
There's clang20 already, can you update it here as well? The main repo can then switch from 19-format to 20-format (version match is pure coincidental) in a separate change if necessary
There was a problem hiding this comment.
Just a heads up, updating this to clang 20 caused new formatting issues to pop up, which probably need to be resolved in its own commit / PR.
https://github.com/OpenRCT2/OpenRCT2/actions/runs/16639115663/job/47085767032?pr=24734
Edit: To add, updating the image used for the AppImage build seems to have a similar issue, where the validation of openrct2.appdata.xml fails. That maybe also needs to be addressed separately, namely due to it requiring changes to identifiers (eg. it warns that the value in the <id> tag is not an rDNS value, but I don't know if changing the id will break things for people with the AppImage already installed).
| @@ -0,0 +1,22 @@ | |||
| # Supplementart image that can build OpenRCT2 for Linux (amd64). | |||
There was a problem hiding this comment.
| # Supplementart image that can build OpenRCT2 for Linux (amd64). | |
| # Supplementary image that can build OpenRCT2 for Linux (amd64). |
There was a problem hiding this comment.
That typo apparently come from the version 19 files I copied to make these, lol.
https://github.com/OpenRCT2/openrct2-docker-build/blob/master/19/bookworm/Dockerfile#L1
| USER root | ||
| RUN pacman -U mingw-w64-libzip-*.zst --noconfirm && pacman -Scc --noconfirm && rm -r /home/build/* | ||
|
|
||
| RUN wget https://github.com/nlohmann/json/releases/download/v3.11.3/include.zip -O /usr/i686-w64-mingw32/json.zip && unzip /usr/i686-w64-mingw32/json.zip -d /usr/i686-w64-mingw32/ && unzip /usr/i686-w64-mingw32/json.zip -d /usr/x86_64-w64-mingw32/ |
There was a problem hiding this comment.
This could use a comment as well
| # GMP and Nettle seem to have their mingw libraries misnamed. pkg-config | ||
| # points to .a, not .dll.a files; additionally cmake removes any such | ||
| # extensions, so symlink the files to their expected places | ||
| RUN ln -s /usr/i686-w64-mingw32/lib/libp11-kit.dll.a /usr/i686-w64-mingw32/lib/libp11-kit.a \ |
| RUN makepkg -sr --noconfirm | ||
| USER root | ||
| RUN pacman -U mingw-w64-libzip-*.zst --noconfirm && pacman -Scc --noconfirm && rm -r /home/build/* | ||
|
|
There was a problem hiding this comment.
| # 3.12.0 contains a major issue related to utf8 strings. Should be fixed when 3.12.1 releases |
|
Just to note, you suggested some changes, but then merged the PR, which closed it, preventing me from accepting the changes. If you want to make those changes, you should probably just commit them directly. |
|
Yeah, I'm fully aware of that. Doesn't bother me too much, it can be fixed whenever - or not. I wanted to unblock testing with updated images already |
2 participants
This is a PR to add the zstd dependency for OpenRCT2/OpenRCT2#24734.
While I was in here, I updated various libraries and tools (eg. Emscripten) as part of the release. Since these are significant updates, I pumped the version number from 19 to 20 to avoid overwriting the old version. This should include all the changes needed for OpenRCT2/OpenRCT2#24843 as well.
For testing with the CI, I wanted to be able to use the github workflow to push the images to my own docker.io account, but the workflow as written didn't support that. I made some changes to the script to allow for forks to push to their own accounts like I did. I made the assumption that
secrets.dockeridis just the public account name 'openrct2'. If that assumption is wrong, then I can adjust the script to account for that. It also can be changed to be a public variable in that case, but for simplicity, I kept it as a secret.