diff options
author | Devan Carpenter <devan@taler.net> | 2024-02-23 07:26:35 -0500 |
---|---|---|
committer | Devan Carpenter <devan@taler.net> | 2024-02-23 07:26:35 -0500 |
commit | 6be23b1500c380ca1453bc1dc6926716704ddafe (patch) | |
tree | d1f99da1d1f14d1d68843091592c0b526a7bb3da | |
parent | 48770cfa443b414373d4f6eb5d4a639c1fb64c36 (diff) | |
download | tutorials-6be23b1500c380ca1453bc1dc6926716704ddafe.tar.gz tutorials-6be23b1500c380ca1453bc1dc6926716704ddafe.tar.bz2 tutorials-6be23b1500c380ca1453bc1dc6926716704ddafe.zip |
ci: update dependencies and instructions
-rwxr-xr-x | contrib/ci/Containerfile | 6 | ||||
-rwxr-xr-x | contrib/ci/ci.sh | 34 | ||||
-rwxr-xr-x | contrib/ci/jobs/0-build/build-docs.sh | 9 |
3 files changed, 42 insertions, 7 deletions
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile index 023d02d..8218ef9 100755 --- a/contrib/ci/Containerfile +++ b/contrib/ci/Containerfile @@ -16,8 +16,12 @@ RUN apt-get update -yqq && \ tex-gyre \ dvipng \ latexmk \ + python3-pip \ && rm -rf /var/lib/apt/lists/* + +RUN pip3 install --break-system-packages sphinxcontrib-video + WORKDIR /workdir -CMD ["bash", "/workdir/ci/jobs/0-build/job.sh"] +CMD ["/bin/bash"] diff --git a/contrib/ci/ci.sh b/contrib/ci/ci.sh new file mode 100755 index 0000000..0719015 --- /dev/null +++ b/contrib/ci/ci.sh @@ -0,0 +1,34 @@ +#!/bin/bash +set -exvuo pipefail + +# Requires podman +# Fails if not found in PATH +OCI_RUNTIME=$(which podman) +REPO_NAME=$(basename "${PWD}") +JOB_NAME="${1}" +JOB_ARCH=$((grep CONTAINER_ARCH contrib/ci/jobs/${JOB_NAME}/config.ini | cut -d' ' -f 3) || echo "${2:-amd64}") +JOB_CONTAINER=$((grep CONTAINER_NAME contrib/ci/jobs/${JOB_NAME}/config.ini | cut -d' ' -f 3) || echo "localhost/${REPO_NAME}:${JOB_ARCH}") +CONTAINER_BUILD=$((grep CONTAINER_BUILD contrib/ci/jobs/${JOB_NAME}/config.ini | cut -d' ' -f 3) || echo "True") + +echo "Image name: ${JOB_CONTAINER}" + +if [ "${CONTAINER_BUILD}" = "True" ] ; then + "${OCI_RUNTIME}" build \ + --arch "${JOB_ARCH}" \ + -t "${JOB_CONTAINER}" \ + -f contrib/ci/Containerfile . +fi + +"${OCI_RUNTIME}" run \ + --rm \ + -ti \ + --arch "${JOB_ARCH}" \ + --env CI_COMMIT_REF="$(git rev-parse HEAD)" \ + --volume "${PWD}":/workdir \ + --workdir /workdir \ + "${JOB_CONTAINER}" \ + contrib/ci/jobs/"${JOB_NAME}"/job.sh + +top_dir=$(dirname "${BASH_SOURCE[0]}") + +#"${top_dir}"/build.sh diff --git a/contrib/ci/jobs/0-build/build-docs.sh b/contrib/ci/jobs/0-build/build-docs.sh index 6accee3..fc60a21 100755 --- a/contrib/ci/jobs/0-build/build-docs.sh +++ b/contrib/ci/jobs/0-build/build-docs.sh @@ -3,12 +3,9 @@ set -eu make html -make latexpdf -rm -rf /artifacts/docs_build +rm -rf /artifacts/tutorials_build -mkdir -p /artifacts/docs_build/docs/html/ -mkdir -p /artifacts/docs_build/docs/pdf/ +mkdir -p /artifacts/tutorials_build/docs/html/ -cp -r _build/html/* /artifacts/docs_build/docs/html/ -cp -r _build/latex/*.pdf /artifacts/docs_build/docs/pdf/ +cp -r _build/html/* /artifacts/tutorials_build/docs/html/ |