From 661dc2dc0e8044815750d22e2c21c6a656343554 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jan 12 2022 15:17:40 +0000 Subject: [PATCH 1/4] Update configuration for Antora 3.0 --- diff --git a/antora.yml b/antora.yml index 7779b80..919026d 100644 --- a/antora.yml +++ b/antora.yml @@ -9,7 +9,7 @@ title: Package Maintainers version: master # We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. -start_page: ROOT:index +start_page: ROOT:index.adoc # This lists all the menu definitions of your component. nav: diff --git a/site.yml b/site.yml index 2dc4185..538206e 100644 --- a/site.yml +++ b/site.yml @@ -1,6 +1,6 @@ site: title: Local Preview - start_page: package-maintainers::index + start_page: package-maintainers::index.adoc content: sources: - url: . @@ -16,5 +16,5 @@ output: destinations: - provider: archive runtime: - pull: true + fetch: true cache_dir: ./cache From 0b2c5697b0dd64b4fa175fe2622c7e8f3512490d Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jan 12 2022 15:18:02 +0000 Subject: [PATCH 2/4] build.sh: Update with latest version from template --- diff --git a/build.sh b/build.sh index f4ecfe4..ed6fd2f 100755 --- a/build.sh +++ b/build.sh @@ -3,25 +3,30 @@ image="docker.io/antora/antora" cmd="--html-url-extension-style=indexify site.yml" -if [ "$(uname)" = "Darwin" ]; then +if [ "$(uname)" == "Darwin" ]; then # Running on macOS. # Let's assume that the user has the Docker CE installed # which doesn't require a root password. echo "" echo "This build script is using Docker container runtime to run the build in an isolated environment." echo "" - docker run --rm -it -v "$(pwd):/antora" $image $cmd + docker run --rm -it -v $(pwd):/antora $image $cmd -elif [ "$(expr substr "$(uname -s)" 1 5)" = "Linux" ]; then +elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then # Running on Linux. - # Check whether podman is available, else fall back to docker + # there isn't an antora/aarch64 container, antora can be installed locally + # Check whether podman is available, else faill back to docker # which requires root. - if [ -f /usr/bin/podman ]; then + if [ -f /usr/local/bin/antora ]; then + /usr/local/bin/antora $cmd + elif [[ `uname -m` == "aarch64" ]]; then + echo "no antora/aarch64 container try just \`npm install -g @antora/cli @antora/site-generator-default\`" + elif [ -f /usr/bin/podman ]; then echo "" echo "This build script is using Podman to run the build in an isolated environment." echo "" - podman run --rm -it -v "$(pwd):/antora:z" $image $cmd + podman run --rm -it -v $(pwd):/antora:z $image $cmd elif [ -f /usr/bin/docker ]; then echo "" @@ -29,13 +34,13 @@ elif [ "$(expr substr "$(uname -s)" 1 5)" = "Linux" ]; then echo "" if groups | grep -wq "docker"; then - docker run --rm -it -v "$(pwd):/antora:z" $image $cmd + docker run --rm -it -v $(pwd):/antora:z $image $cmd else echo "" echo "This build script is using $runtime to run the build in an isolated environment. You might be asked for your password." echo "You can avoid this by adding your user to the 'docker' group, but be aware of the security implications. See https://docs.docker.com/install/linux/linux-postinstall/." echo "" - sudo docker run --rm -it -v "$(pwd):/antora:z" $image $cmd + sudo docker run --rm -it -v $(pwd):/antora:z $image $cmd fi else echo "" From cdd416033006f8114a57b962f114dd8e1ccc5dee Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jan 12 2022 15:20:10 +0000 Subject: [PATCH 3/4] Package_Retirement_Process: Fix link to Upstream release monitoring Fixes: ``` [15:18:12.532] ERROR (asciidoctor): target of xref not found: Upstream_release_monitoring.adco file: /antora/modules/ROOT/pages/Package_Retirement_Process.adoc source: /antora (refname: main ) ``` --- diff --git a/modules/ROOT/pages/Package_Retirement_Process.adoc b/modules/ROOT/pages/Package_Retirement_Process.adoc index d0327ef..fd55f10 100644 --- a/modules/ROOT/pages/Package_Retirement_Process.adoc +++ b/modules/ROOT/pages/Package_Retirement_Process.adoc @@ -59,7 +59,7 @@ Remove the package from any https://pagure.io/fedora-kickstarts[spin kickstart f [#upstream_release_monitoring] === Upstream Release Monitoring -Remove the package from xref:Upstream_release_monitoring.adco[Upstream release monitoring] if it is listed. +Remove the package from xref:Upstream_Release_Monitoring.adoc[Upstream release monitoring] if it is listed. === Koji From f4d973c9d677fd1b8a2ec4ec859a930574fe3122 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Jan 12 2022 15:21:01 +0000 Subject: [PATCH 4/4] *.yaml: Minor styling fixes --- diff --git a/antora.yml b/antora.yml index 919026d..87216d2 100644 --- a/antora.yml +++ b/antora.yml @@ -1,14 +1,20 @@ # Name will be mostly visible in the URL. Treat it as an identifier. -# Tip: If you want to use the local preview scripts that come with this repository, please change this value in the site.yml file as well. (under site/start_page) +# Tip: If you want to use the local preview scripts that come with this +# repository, please change this value in the site.yml file as well. (under +# site/start_page) name: package-maintainers -# Title will be visible on the page. +# Title will be visible on the page. title: Package Maintainers -# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. +# If you don't plan to have multiple versions of the docs (for example, to +# document multiple versions of some software), you can ignore this field. +# Otherwise, change "master" to a specific version. version: master -# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. +# We encourage you to name the index page as "index.adoc". If you absolutely +# have to use a different name, please reflect it here. You can ignore this +# field otherwise. start_page: ROOT:index.adoc # This lists all the menu definitions of your component. diff --git a/site.yml b/site.yml index 538206e..e0a08e1 100644 --- a/site.yml +++ b/site.yml @@ -1,4 +1,4 @@ -site: +site: title: Local Preview start_page: package-maintainers::index.adoc content: @@ -10,11 +10,11 @@ ui: url: https://asamalik.fedorapeople.org/ui-bundle.zip snapshot: true default_layout: with_menu -output: - clean: true +output: + clean: true dir: ./public - destinations: - - provider: archive + destinations: + - provider: archive runtime: fetch: true cache_dir: ./cache