Skip to content

Commit 0283d82

Browse files
author
Release Manager
committed
gh-40089: Meson: test void linux on CI and add devcontainer for it <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes #12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes #12345". --> Add a CI test for Void Linux building sage with meson (similar to #40038 for Fedora). A few minor bugs in the system package installation are fixed: a missing `--yes` for the package index update, and adding a few missing void packages. ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - #12345: short description why this is a dependency --> <!-- - #34567: ... --> URL: #40089 Reported by: Tobias Diez Reviewer(s): Dima Pasechnik, Tobias Diez
2 parents 7b74bf7 + 6eb4fc7 commit 0283d82

File tree

7 files changed

+44
-5
lines changed

7 files changed

+44
-5
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM ghcr.io/void-linux/void-glibc-full
2+
RUN xbps-install -Suy bash git python
3+
RUN chsh -s /usr/bin/bash
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "void",
4+
// Doesn't include 'bash', so we use a custom dockerfile
5+
// "image": "ghcr.io/void-linux/void-glibc-full",
6+
"dockerFile": "Dockerfile",
7+
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
8+
"features": {
9+
// Git feature is not compatible with Void Linux, so we install it manually in the Dockerfile
10+
// https://github.com/devcontainers/features/issues/824
11+
//"ghcr.io/devcontainers/features/git": {},
12+
//"ghcr.io/devcontainers/features/python:1": {},
13+
"../uv": {
14+
"version": "latest"
15+
}
16+
},
17+
"customizations": {
18+
"vscode": {
19+
"extensions": [
20+
"ms-python.python"
21+
]
22+
}
23+
}
24+
}

.github/workflows/ci.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,23 @@ jobs:
2222
container:
2323
- fedora:41
2424
- fedora:42
25+
- ghcr.io/void-linux/void-glibc-full
2526
#- ubuntu:22.04 - fails due to issue with cypari2
2627
#- ubuntu:24.04 - fails due to issue with cypari2
2728
- ubuntu:25.04
2829
container:
2930
image: ${{ matrix.container }}
3031

3132
steps:
33+
- name: Prepare container
34+
run: |
35+
if [ "${{ matrix.container }}" = "ghcr.io/void-linux/void-glibc-full" ]; then
36+
xbps-install -Syu xbps
37+
xbps-install -yu
38+
# node-based actions require libstdc++.so.6
39+
xbps-install -Sy libstdc++ bash git
40+
fi
41+
3242
- name: Checkout code
3343
# cannot use v4 yet because of https://github.com/actions/checkout/issues/1487
3444
uses: actions/checkout@v3
@@ -85,10 +95,10 @@ jobs:
8595
id: clear-container-name
8696
if: failure() || success()
8797
run: |
88-
# Output the container name, but with ":" replaced by "-"
89-
# This is needed to avoid issues with the upload-artifact action
90-
CONTAINER_NAME=$(echo "${{ matrix.container }}" | tr ':' '-')
91-
echo "CONTAINER_NAME=$CONTAINER_NAME" >> $GITHUB_OUTPUT
98+
# Output the container name, but with ":" and "/" replaced by "-"
99+
# This is needed to avoid issues with the upload-artifact action
100+
CONTAINER_NAME=$(echo "${{ matrix.container }}" | tr ':/' '--')
101+
echo "CONTAINER_NAME=$CONTAINER_NAME" >> $GITHUB_OUTPUT
92102
93103
- name: Upload log
94104
uses: actions/[email protected]

build/bin/sage-print-system-package-command

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ case $system:$command in
172172
fi
173173
;;
174174
void*:update)
175-
print_shell_command "${SUDO}xbps-install -Su"
175+
print_shell_command "${SUDO}xbps-install -Suy"
176176
;;
177177
void*:install)
178178
[ "$YES" = yes ] && options="$options --yes"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sage-data-elliptic_curves

build/pkgs/gap/distros/void.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gap-devel

0 commit comments

Comments
 (0)