diff options
| author | Thibault Saunier <tsaunier@igalia.com> | 2021-09-28 16:29:12 -0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-09-29 16:40:00 +0000 |
| commit | a619f2cedfae09d542298c59b102705757c80d40 (patch) | |
| tree | 7235dcbfa195ed08e211d8362aa156e3a700efed /ci | |
| parent | 6bb03ddafcf37b3969a1541844577c80e87565fd (diff) | |
| download | gstreamer-a619f2cedfae09d542298c59b102705757c80d40.tar.gz | |
docs: Always build documentation on gstreamer/gstreamer main branch
So artifacts can the be imported on gst.fd.o.
And update the importation script accordingly
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/952>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/gitlab/freedesktop_doc_importer.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ci/gitlab/freedesktop_doc_importer.sh b/ci/gitlab/freedesktop_doc_importer.sh index be68222d0f..bbebaf5ee8 100755 --- a/ci/gitlab/freedesktop_doc_importer.sh +++ b/ci/gitlab/freedesktop_doc_importer.sh @@ -2,14 +2,14 @@ set -e -BRANCH=master +BRANCH=main NAMESPACE=gstreamer JOB=documentation -WORK_DIR=`mktemp -d -p "$DIR"` +WORK_DIR=$(mktemp -d -p "$DIR") # deletes the temp directory -function cleanup { +cleanup() { rm -rf "$WORK_DIR" echo "Deleted temp working directory $WORK_DIR" } @@ -19,12 +19,12 @@ trap cleanup EXIT echo "" echo "============================================================================================================================" -echo "Updating documentation from: https://gitlab.freedesktop.org/$NAMESPACE/gst-docs/-/jobs/artifacts/$BRANCH/download?job=$JOB" +echo "Updating documentation from: https://gitlab.freedesktop.org/$NAMESPACE/gstreamer/-/jobs/artifacts/$BRANCH/download?job=$JOB" date cd $WORK_DIR -wget https://gitlab.freedesktop.org/$NAMESPACE/gst-docs/-/jobs/artifacts/$BRANCH/download?job=$JOB -O gstdocs.zip +wget https://gitlab.freedesktop.org/$NAMESPACE/gstreamer/-/jobs/artifacts/$BRANCH/download?job=$JOB -O gstdocs.zip unzip gstdocs.zip @@ -32,6 +32,5 @@ DOC_BASE="/srv/gstreamer.freedesktop.org/public_html/documentation" rsync -rvaz --links --delete documentation/ $DOC_BASE || /bin/true chmod -R g+w $DOC_BASE; chgrp -R gstreamer $DOC_BASE - echo "Done updating documentation" echo ""
\ No newline at end of file |