Commit Graph

11 Commits

Author SHA1 Message Date
Denis 'GNUtoo' Carikli 7de7eb2a76
[COMPAT] website-build: Add back separate image repository
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
2023-11-13 17:40:15 +01:00
Denis 'GNUtoo' Carikli ad8c60c362
Revert "website-build: use website from local git repository."
This reverts commit 20d122e94a.
2023-11-13 17:39:41 +01:00
Denis 'GNUtoo' Carikli 27ddd0fd8e
Fix website <title></title>.
The new untitled revision has a fix for having spaces inside the
website title.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:45:07 +01:00
Denis 'GNUtoo' Carikli 20d122e94a
website-build: use website from local git repository.
Before we needed to fetch the website from git because it was in a
separate repository.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:44:50 +01:00
Denis 'GNUtoo' Carikli 399360485d
website-build: build.sh: i="$(expr "$i" + 1)": fix double quote.
Without that fix, we end up with 'Fix SC2086 (info): Double quote to
prevent globbing and word splitting.' shellcheck warnings.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:44:35 +01:00
Denis 'GNUtoo' Carikli 4b122e8989
website-build: build.sh: fix missing double quote in $i comparison.
Without that fix, using shellcheck on this file results in several warning
like this one:
    In website-build/build.sh line 101:
    			if [ $i -ge $# ] ; then
                                 ^-- SC2086 (info):
				 Double quote to prevent
				 globbing and word splitting.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:44:18 +01:00
Denis 'GNUtoo' Carikli 1645d7abe1
website-build: build.sh: Use bash.
Without that fix, using shellcheck on this file results in several warning
like this one:
    In website-build/build.sh line 32:
    	echo -e "\t-h, --help"
                 ^-- SC3037 (warning):
		 In POSIX sh, echo flags are undefined.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-12 01:43:31 +01:00
Denis 'GNUtoo' Carikli c007ab227d
website-build: build.sh: switch to GNU Boot repositories.
Since the website and the images were merged in GNU boot respectively
in site/ and www/, we can now modify GNU boot to only be cloned once
to build the website.

The image path was also modified to make images work both in the local
served website and at gnu.org and also to minimize the differences
between the test and deployment setups.

Libreboot.at also hosted a copy of Untitled to make it simple to
control the revision being used.

But in the longer term, it would be a bad idea to do that again for
GNU boot since there are plans to convert the website and/or
documentation to the texinfo format, and so at some point Untitled
will stop being used, and we don't want to end up with a git
repository that needs to be kept for historic reasons but that is
unused.

Since the website isn't ready we also have a redirection to Savannah
to make sure that visitors are redirected to something meaningful.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Neox: Suggested the split in smaller commits and various ways to do
    that (including some that were used).
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:08:25 +01:00
Denis 'GNUtoo' Carikli cc3dea2d7b
Move images in the website directory
Since the website and the images were merged in GNU boot respectively
in site/ and www/, we can now modify GNU boot to only be cloned once
to build the website.

This also requires to move the images inside site/ at the place where
website-build expects them.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Neox: Suggested the split from the "website-build: build.sh: switch to
      GNU Boot repositories." commit.
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:07:59 +01:00
Denis 'GNUtoo' Carikli 0ef17277de
website-build: Enable to use specific revisions for git repositories.
This for instance enable users to manually override the revisions to
test branches of git repositories.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 19:07:43 +01:00
Denis 'GNUtoo' Carikli dc6e1f32c1
Import website-build to build the GNU Boot website.
Having that code inside the same repository than GNU Boot makes it
easier to keep Untitled versions (and possibly additional patches on
top) in sync with the documentation/website being worked on.

This is relevant as there are plans within GNU Boot to convert the
website to Texinfo but that would require to patch untitled (to add
support for Texinfo pages in untitled) to do a progressive transition
to Texinfo.

Using an external repository to temporarily maintain a patched version
of Untitled is not optimal as we would end up having to warn users not
to use that repository anymore at some point.

Bringing in the whole untitled source code and documentation in this
GNU Boot repository is also not a good option since we only need
minimal patching on top of untitled, so in the long run not doing that
would help keep the GNU Boot repository smaller and more simple.

In addition we currently do need to wrap the build with a fixed Guix
revision as for instance with a more recent Guix revision than the one
used by website-built, for instance at the commit ("gnu: nyxt: Update
to 3.9.0."), if we run ./build.sh directly without using a fixed Guix
revision, the build is broken:
    Generating 'www/lbwww/site/index.html'
    Generating 'www/lbwww/site/license.html'
    YAML parse exception at line 7, column 0,
    while scanning a simple key:
    could not find expected ':'

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
2023-11-07 18:28:16 +01:00