From 1941dda4e8e19da372bdd7c768817eb31298bc06 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Thu, 19 Dec 2024 00:17:15 +0100 Subject: [PATCH] website: status: tables: workaround lack of colspan. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using ./configure --disable-guix, and a recent distribution (like Parabola and Guix but not Trisquel 11 (aramo)), we can see cells spanning multiple columns. Once the website is built (with make build), we can easily test for that with grep: $ grep colspan ./untitled/www/lbwww/site/status.html Can’t install due to missing images Fail: #66487 Untested | Untested | Untested | Untested Can’t install due to missing images Fail: #66463, #66487 Untested | Untested | Fail: #66487 | Fail: #66487 Can’t install due to missing images Can’t install due to missing images Can’t install due to missing images But with ./configure without --disable-guix, we don't see any columns spanning since the commit 338154a65451c088f9d14334e64e2bb12db255d7 ("website: Makefile.am: use common guix shell command."). If we build the website at this commit (without --disable-guix) we see that the '--commit=' argument is bogus in the command being used: guix time-machine --commit= -- shell --system=i686-linux --container --network --emulate-fhs --share=`realpath ../` bash coreutils findutils git grep nss-certs pandoc sed -- ./build.sh And we then ends up with this message: guix time-machine: error: Git error: unable to parse OID - too short This was then repaired in the commit 2e3818668d1d65ae02c508851885a7a812ec23cb ("website: use Guix v1.4.0."), but we then end up without 'colspan' because we ended up using older software that don't support this feature. There are two reasons for not relying yet on this feature: - We want to use Guix v1.4.0. - We build a tarball of the website is also part of the release, and guix is not used during the build. And we need all distributions to produce at the very least a functionally equivalent output. Signed-off-by: Denis 'GNUtoo' Carikli Acked-by: Adrien 'neox' Bourmault --- website/pages/status.es.md | 28 ++++++++++++++-------------- website/pages/status.md | 25 ++++++++++++++----------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/website/pages/status.es.md b/website/pages/status.es.md index 2941d6d..0c57a37 100644 --- a/website/pages/status.es.md +++ b/website/pages/status.es.md @@ -20,8 +20,8 @@ Estado de GNU Boot 0.1 RC5 +------------------+--------------+--------------+--------------+--------------+ | Apple, iMac 5,2 | No probado | No probado | No probado | No probado | +------------------+--------------+--------------+--------------+--------------+ -| Asus, | | -| Chromebook C201 | No se puede instalar debido a que faltan imágenes. | +| Asus, | Faltan | Faltan | Faltan | Faltan | +| Chromebook C201 | imágenes | imágenes | imágenes | imágenes | +------------------+--------------+--------------+--------------+--------------+ | Asus, KCMA-D8 | No probado | No probado | No probado | No probado | +------------------+--------------+--------------+--------------+--------------+ @@ -29,8 +29,8 @@ Estado de GNU Boot 0.1 RC5 +------------------+--------------+--------------+--------------+--------------+ | Asus, KGPE-D16 | No probado | No probado | No probado | No probado | +------------------+--------------+--------------+--------------+--------------+ -| Gigabyte, | | -| D945GCLF2D | Fallado: #66463 | +| Gigabyte, | Fallado: | Fallado: | Fallado: | Fallado: | +| D945GCLF2D | #66463 | #66463 | #66463 | #66463 | +------------------+--------------+--------------+--------------+--------------+ | Gigabyte, | No probado | No probado | No probado | No probado | | GA-G41M-ES2L | | | | | @@ -184,8 +184,8 @@ Estado de GNU Boot 0.1 RC4 | Apple, iMac 5,2 | No probado | No probado | Fallado: | Fallado: | | | | | #66487 | #66487 | +------------------+--------------+--------------+--------------+--------------+ -| Asus, | | -| Chromebook C201 | No se puede instalar debido a que faltan imágenes. | +| Asus, | Faltan | Faltan | Faltan | Faltan | +| Chromebook C201 | imágenes | imágenes | imágenes | imágenes | +------------------+--------------+--------------+--------------+--------------+ | Asus, KCMA-D8 | No probado | No probado | Fallado: | Fallado: | | | | | #66487 | #66487 | @@ -196,8 +196,8 @@ Estado de GNU Boot 0.1 RC4 | Asus, KGPE-D16 | No probado | No probado | Fallado: | Fallado: | | | | | #66487 | #66487 | +------------------+--------------+--------------+--------------+--------------+ -| Gigabyte, | | -| D945GCLF2D | Fallado: #66463, #66487 | +| Gigabyte, | Fallado: | Fallado: | Fallado: | Fallado: | +| D945GCLF2D | #66463 | #66463 | #66463,#66487|#66463,#66487 | +------------------+--------------+--------------+--------------+--------------+ | Gigabyte, | No probado | No probado | Fallado: | Fallado: | | GA-G41M-ES2L | | | #66487 | #66487 | @@ -314,8 +314,8 @@ Estado de GNU Boot 0.1 RC3 +---------------+----------------+-----------------+-------------+-------------+ | Apple | iMac 5,2 | No probado | No probado | No probado | +---------------+----------------+-----------------+-------------+-------------+ -| Asus | Chromebook | No se puede instalar debido a que faltan | -| | C201 | imágenes. | +| Asus | Chromebook | Faltan | Faltan | Faltan | +| | C201 | imágenes | imágenes | imágenes | +---------------+----------------+-----------------+-------------+-------------+ | Asus | KCMA-D8 | No probado | No probado | No probado | +---------------+----------------+-----------------+-------------+-------------+ @@ -412,8 +412,8 @@ algunas computadoras en el RC2 para reducir el riesgo de los probadores. +---------------+----------------+-----------------+-------------+-------------+ | Apple | iMac 5,2 | No probado | No probado | No probado | +---------------+----------------+-----------------+-------------+-------------+ -| Asus | Chromebook | No se puede instalar debido a que faltan | -| | C201 | imágenes. | +| Asus | Chromebook | Faltan | Faltan | Faltan | +| | C201 | imágenes | imágenes | imágenes | +---------------+----------------+-----------------+-------------+-------------+ | Asus | KCMA-D8 | No probado | No probado | No probado | +---------------+----------------+-----------------+-------------+-------------+ @@ -505,8 +505,8 @@ Estado de GNU Boot 0.1 RC1 +---------------+----------------+-----------------+-------------+-------------+ | Apple | iMac 5,2 | No probado | No probado | No probado | +---------------+----------------+-----------------+-------------+-------------+ -| Asus | Chromebook | No se puede instalar debido a que faltan | -| | C201 | imágenes. | +| Asus | Chromebook | Faltan | Faltan | Faltan | +| | C201 | imágenes | imágenes | imágenes | +---------------+----------------+-----------------+-------------+-------------+ | Asus | KCMA-D8 | No probado | No probado | No probado | +---------------+----------------+-----------------+-------------+-------------+ diff --git a/website/pages/status.md b/website/pages/status.md index 54977cc..ac005a7 100644 --- a/website/pages/status.md +++ b/website/pages/status.md @@ -21,8 +21,8 @@ GNU Boot 0.1 RC5 status +------------------+--------------+--------------+--------------+--------------+ | Apple, iMac 5,2 | Untested | Untested | Untested | Untested | +------------------+--------------+--------------+--------------+--------------+ -| Asus, | | -| Chromebook C201 | Can't install due to missing images | +| Asus, | Missing | Missing | Missing | Missing | +| Chromebook C201 | images | images | images | images | +------------------+--------------+--------------+--------------+--------------+ | Asus, KCMA-D8 | Untested | Untested | Untested | Untested | +------------------+--------------+--------------+--------------+--------------+ @@ -30,8 +30,8 @@ GNU Boot 0.1 RC5 status +------------------+--------------+--------------+--------------+--------------+ | Asus, KGPE-D16 | Untested | Untested | Untested | Untested | +------------------+--------------+--------------+--------------+--------------+ -| Gigabyte, | | -| D945GCLF2D | Fail: #66487 | +| Gigabyte, | | | | | +| D945GCLF2D | Fail: #66487 | Fail: #66463 | Fail: #66463 | Fail: #66463 | +------------------+--------------+--------------+--------------+--------------+ | Gigabyte, | | | | | | GA-G41M-ES2L | Untested | Untested | Untested | Untested | @@ -170,8 +170,8 @@ GNU Boot 0.1 RC4 status +------------------+--------------+--------------+--------------+--------------+ | Apple, iMac 5,2 | Untested | Untested | Fail: #66487 | Fail: #66487 | +------------------+--------------+--------------+--------------+--------------+ -| Asus, | | -| Chromebook C201 | Can't install due to missing images | +| Asus, | Missing | Missing | Missing | Missing | +| Chromebook C201 | images | images | images | images | +------------------+--------------+--------------+--------------+--------------+ | Asus, KCMA-D8 | Untested | Untested | Fail: #66487 | Fail: #66487 | +------------------+--------------+--------------+--------------+--------------+ @@ -179,8 +179,8 @@ GNU Boot 0.1 RC4 status +------------------+--------------+--------------+--------------+--------------+ | Asus, KGPE-D16 | Untested | Untested | Fail: #66487 | Fail: #66487 | +------------------+--------------+--------------+--------------+--------------+ -| Gigabyte, | | -| D945GCLF2D | Fail: #66463, #66487 | +| Gigabyte, | Fail: #66463 | Fail: #66463 | Fail: #66463 | Fail: #66463 | +| D945GCLF2D | | | Fail: #66487 | Fail: #66487 | +------------------+--------------+--------------+--------------+--------------+ | Gigabyte, | | | | | | GA-G41M-ES2L | Untested | Untested | Fail: #66487 | Fail: #66487 | @@ -292,7 +292,8 @@ GNU Boot 0.1 RC3 status +---------------+--------------------+--------------+-------------+------------+ | Apple | iMac 5,2 | Untested | Untested | Untested | +---------------+--------------------+--------------+-------------+------------+ -| Asus | Chromebook C201 | Can't install due to missing images | +| Asus | Chromebook C201 | Missing | Missing | Missing | +| | | images | images | images | +---------------+--------------------+--------------+-------------+------------+ | Asus | KCMA-D8 | Untested | Untested | Untested | +---------------+--------------------+--------------+-------------+------------+ @@ -389,7 +390,8 @@ the RC2 to reduce the risk of testers. +---------------+--------------------+--------------+-------------+------------+ | Apple | iMac 5,2 | Untested | Untested | Untested | +---------------+--------------------+--------------+-------------+------------+ -| Asus | Chromebook C201 | Can't install due to missing images | +| Asus | Chromebook C201 | Missing | Missing | Missing | +| | | images | images | images | +---------------+--------------------+--------------+-------------+------------+ | Asus | KCMA-D8 | Untested | Untested | Untested | +---------------+--------------------+--------------+-------------+------------+ @@ -481,7 +483,8 @@ GNU Boot 0.1 RC1 status +---------------+--------------------+--------------+-------------+------------+ | Apple | iMac 5,2 | Untested | Untested | Untested | +---------------+--------------------+--------------+-------------+------------+ -| Asus | Chromebook C201 | Can't install due to missing images | +| Asus | Chromebook C201 | Missing | Missing | Missing | +| | | images | images | images | +---------------+--------------------+--------------+-------------+------------+ | Asus | KCMA-D8 | Untested | Untested | Untested | +---------------+--------------------+--------------+-------------+------------+