Skip to content
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
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
3 changes: 3 additions & 0 deletions .devcontainer/portability-void/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM ghcr.io/void-linux/void-glibc-full
RUN xbps-install -Suy bash git python
RUN chsh -s /usr/bin/bash
24 changes: 24 additions & 0 deletions .devcontainer/portability-void/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// See https://aka.ms/devcontainer.json for format details.
{
"name": "void",
// Doesn't include 'bash', so we use a custom dockerfile
// "image": "ghcr.io/void-linux/void-glibc-full",
"dockerFile": "Dockerfile",
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
"features": {
// Git feature is not compatible with Void Linux, so we install it manually in the Dockerfile
// https://github.com/devcontainers/features/issues/824
//"ghcr.io/devcontainers/features/git": {},
//"ghcr.io/devcontainers/features/python:1": {},
"../uv": {
"version": "latest"
}
},
"customizations": {
"vscode": {
"extensions": [
"ms-python.python"
]
}
}
}
10 changes: 10 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,23 @@ jobs:
container:
- fedora:41
- fedora:42
- ghcr.io/void-linux/void-glibc-full
Copy link
Member

Choose a reason for hiding this comment

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

glibc ? Isn't it a non-standard void configuration? Why not a musllib one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

okay

#- ubuntu:22.04 - fails due to issue with cypari2
#- ubuntu:24.04 - fails due to issue with cypari2
- ubuntu:25.04
container:
image: ${{ matrix.container }}

steps:
- name: Prepare container
run: |
if [ "${{ matrix.container }}" = "ghcr.io/void-linux/void-glibc-full" ]; then
xbps-install -Syu xbps
xbps-install -yu
# node-based actions require libstdc++.so.6
xbps-install -Sy libstdc++ bash git
fi

- name: Checkout code
# cannot use v4 yet because of https://github.com/actions/checkout/issues/1487
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion build/bin/sage-print-system-package-command
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ case $system:$command in
fi
;;
void*:update)
print_shell_command "${SUDO}xbps-install -Su"
print_shell_command "${SUDO}xbps-install -Suy"
;;
void*:install)
[ "$YES" = yes ] && options="$options --yes"
Expand Down
1 change: 1 addition & 0 deletions build/pkgs/elliptic_curves/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sage-data-elliptic_curves
1 change: 1 addition & 0 deletions build/pkgs/gap/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gap-devel
Loading