Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
26 changes: 0 additions & 26 deletions .github/workflows/libnvme-coverage.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/libnvme-docs.yaml

This file was deleted.

22 changes: 12 additions & 10 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
# SPDX-License-Identifier: Apache-2.0

version: 2

build:
os: ubuntu-24.04
tools:
python: "3"
python: "3.11"

apt_packages:
- meson
- python3-lxml
- docbook-xsl
- xsltproc
- pandoc
Comment thread
igaw marked this conversation as resolved.
jobs:
post_install:
- pip3 install lxml
pre_build:
- meson setup .build -Ddocs=rst -Ddocs-build=true -Dnvme=disabled -Dlibnvme=disabled -Dpython=disabled || cat .build/meson-logs/meson-log.txt
- meson compile -C .build
- asciidoc
- xmlto

commands:
- pip install lxml
- scripts/build.sh docs
- cp .build-ci/Documentation/nvme.html .build-ci/Documentation/index.html
Comment thread
igaw marked this conversation as resolved.

output: .build-ci/Documentation

sphinx:
configuration: .build/libnvme/doc/conf.py
formats: []
Comment thread
igaw marked this conversation as resolved.
Comment thread
igaw marked this conversation as resolved.
22 changes: 22 additions & 0 deletions libnvme/.readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# SPDX-License-Identifier: Apache-2.0

version: 2

build:
os: ubuntu-24.04
tools:
python: "3.11"

apt_packages:
- meson
- python3-lxml
- docbook-xsl
- xsltproc
- pandoc

commands:
- pip install lxml
- scripts/build.sh rst_docs

sphinx:
configuration: .build-ci/libnvme/doc/conf.py
19 changes: 16 additions & 3 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ usage() {
echo " cross use cross toolchain to build"
echo " coverage build coverage report"
echo " distro build libnvme and nvme-cli separately"
echo " docs build documentation"
echo " docs build all documentation"
echo " rst_docs build rst documentation only"
echo " static build a static binary"
echo " libnvme build only libnvme"
echo ""
Expand Down Expand Up @@ -123,12 +124,24 @@ config_meson_coverage() {

config_meson_docs() {
CC="${CC}" "${MESON}" setup \
-Dnvme=disabled \
-Dlibnvme=disabled \
-Ddocs=all \
-Ddocs-build=true \
--prefix=/tmp/usr \
"${BUILDDIR}"
}

config_meson_rst_docs() {
CC="${CC}" "${MESON}" setup \
-Dnvme=disabled \
-Dlibnvme=disabled \
-Ddocs=rst \
-Ddocs-build=true \
Comment thread
igaw marked this conversation as resolved.
--prefix=/tmp/usr \
"${BUILDDIR}"
}

config_meson_static() {
CC="${CC}" "${MESON}" setup \
--werror \
Expand All @@ -146,8 +159,8 @@ config_meson_libnvme() {
CC="${CC}" "${MESON}" setup \
--werror \
--buildtype="${BUILDTYPE}" \
-Dnvme=disabled \
-Dlibnvme=enabled \
-Dnvme=disabled \
-Dlibnvme=enabled \
"${BUILDDIR}"
}

Expand Down
Loading