Skip to content
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

Jump to bottom

builder: add new API versions for Meson 1.5.0+ #266

Merged
merged 3 commits into from
Jul 13, 2024
Merged

builder: add new API versions for Meson 1.5.0+ #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb6a627
builder/windows: rename package.use file in container image
bgilbert Jul 13, 2024
ea38d17
builder/windows: accept unstable Meson
bgilbert Jul 13, 2024
81b0f21
builder: add new API versions
bgilbert Jul 13, 2024
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 builder/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM quay.io/almalinuxorg/almalinux:8
# NOTE: try to keep the current container image compatible with the latest
# stable source release, so people can conveniently build from the source
# tarball
RUN touch /etc/openslide-linux-builder-v2
RUN touch /etc/openslide-linux-builder-v{2,3}
RUN dnf -y upgrade && \
dnf -y install 'dnf-command(config-manager)' epel-release && \
dnf config-manager --set-enabled powertools && \
Expand Down
7 changes: 5 additions & 2 deletions builder/windows/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ FROM docker.io/gentoo/stage3:latest
# NOTE: try to keep the current container image compatible with the latest
# stable source release, so people can conveniently build from the source
# tarball
RUN touch /etc/openslide-winbuild-builder-v3
RUN touch /etc/openslide-winbuild-builder-v{3,4}
RUN echo 'FEATURES="-sandbox -usersandbox -ipc-sandbox -network-sandbox -pid-sandbox"' >> /etc/portage/make.conf
COPY package.use /etc/portage/package.use/cross
COPY package.accept_keywords /etc/portage/package.accept_keywords/openslide
COPY package.use /etc/portage/package.use/openslide
RUN mkdir -p /var/db/repos/crossdev/{profiles,metadata} && echo crossdev > /var/db/repos/crossdev/profiles/repo_name && echo 'masters = gentoo' > /var/db/repos/crossdev/metadata/layout.conf && chown -R portage:portage /var/db/repos/crossdev
COPY repos.conf /etc/portage/repos.conf/crossdev.conf
COPY --from=docker.io/gentoo/portage:latest /var/db/repos/gentoo /var/db/repos/gentoo
RUN emerge -u dev-build/meson && \
rm /var/cache/distfiles/*
RUN emerge app-portage/gentoolkit dev-lang/nasm dev-libs/glib \
dev-python/tomli dev-util/glib-utils dev-vcs/git sys-devel/crossdev && \
rm /var/cache/distfiles/*
Expand Down
1 change: 1 addition & 0 deletions builder/windows/package.accept_keywords
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dev-build/meson ~amd64
Loading