Skip to content

Commit 1ed5b51

Browse files
author
Release Manager
committed
gh-35285: System package information tox ini gh actions for alpine linux ### πŸ“š system pkgs info and GH actions for alpine linux Will fix #33083. This is the rebase of the branch of the latter on top of 10.0.beta4, reduced to the scripts and package lists. Workarounds for musl libc from #33083 will be revisited in a follow up. ### πŸ“ Checklist - [X] I have made sure that the title is self-explanatory and the description concisely explains the PR. - [X] I have linked an issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### Dependencies - #35290 - pplpy 0.8.7 - #35094 - saner libsingular linking URL: #35285 Reported by: Dima Pasechnik Reviewer(s): Dima Pasechnik, Matthias KΓΆppe
2 parents d687f2e + bb35159 commit 1ed5b51

File tree

40 files changed

+78
-4
lines changed

40 files changed

+78
-4
lines changed

β€Žbuild/bin/sage-print-system-package-commandβ€Ž

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,12 @@ case $system:$command in
162162
nix*:install)
163163
[ -n "$system_packages" ] && print_shell_command "nix-env --install $system_packages"
164164
;;
165+
alpine:update)
166+
print_shell_command "apk update"
167+
;;
168+
alpine:install)
169+
[ -n "$system_packages" ] && print_shell_command "apk add $system_packages"
170+
;;
165171
pip:install)
166172
[ -n "$system_packages" ] && print_shell_command "sage -pip install $system_packages"
167173
;;

β€Žbuild/bin/write-dockerfile.shβ€Ž

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,11 @@ EOF
158158
RUN="RUN . /opt/conda/etc/profile.d/conda.sh; conda activate base; " # to activate the conda env
159159
;;
160160
*)
161-
echo "Not implemented: package installation for SYSTEM=$SYSTEM" >&2
162-
exit 1
161+
cat <<EOF
162+
ARG BASE_IMAGE
163+
FROM \${BASE_IMAGE} as with-system-packages
164+
EOF
165+
INSTALL=$(sage-print-system-package-command $SYSTEM install " ")
163166
;;
164167
esac
165168

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
bash
2+
gettext-dev
3+
autoconf
4+
automake
5+
libtool
6+
pkgconf
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
binutils
2+
make
3+
m4
4+
perl
5+
python3
6+
tar
7+
bc
8+
gcc
9+
g++
10+
ca-certificates
11+
coreutils
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bzip2
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
curl
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
flint-dev
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
freetype-dev
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gc-dev
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gdb

0 commit comments

Comments
Β (0)