Skip to content

Commit

Permalink
Merge pull request #174 from bgilbert/fixes
Browse files Browse the repository at this point in the history
Clarify error if we don't find the container ABI flag
  • Loading branch information
bgilbert authored Nov 1, 2023
2 parents 6354eca + c6863d5 commit 8818033
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
- [ ] Verify that CI creates a [GitHub release](https://github.com/openslide/openslide-bin/releases/) with artifacts
- [ ] Update website: `_data/releases.yaml`, maybe `_includes/news.md`
- [ ] Possibly send mail to -announce and -users
- [ ] Possibly post to [forum.image.sc](https://forum.image.sc/c/announcements/10)
- [ ] Update `WINBUILD_RELEASE` in [OpenSlide Python CI](https://github.com/openslide/openslide-python/blob/main/.github/workflows/python.yml)
4 changes: 3 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,9 @@ updates() {
probe() {
# Probe the build environment and set up variables
if [ ! -e /etc/openslide-winbuild-builder-v1 ] && [ ! -e /etc/openslide-winbuild-builder-v2 ]; then
echo "Must run inside the builder container. See README.md."
echo "Not running in a compatible builder container. Either build.sh isn't running"
echo "in the container (see instructions in README.md) or the container image is too"
echo "old or too new."
exit 1
fi

Expand Down
2 changes: 2 additions & 0 deletions builder/linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Use a Linux distro with an older glibc for maximum compatibility
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 zip
RUN touch /etc/openslide-linux-builder-v1
RUN dnf -y upgrade && \
dnf -y install 'dnf-command(config-manager)' epel-release && \
Expand Down
2 changes: 2 additions & 0 deletions builder/windows/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
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 zip
RUN touch /etc/openslide-winbuild-builder-v2
RUN echo 'FEATURES="-sandbox -usersandbox -ipc-sandbox -network-sandbox -pid-sandbox"' >> /etc/portage/make.conf
COPY package.accept_keywords /etc/portage/package.accept_keywords/cross
Expand Down

0 comments on commit 8818033

Please sign in to comment.