From 6e611632b24bfa1c5482fbbb0c3553a77025209e Mon Sep 17 00:00:00 2001 From: Deepak Khatri <lorforlinux@beagleboard.org> Date: Thu, 1 Sep 2022 18:45:50 +0530 Subject: [PATCH] Update CI and build script --- .gitlab-ci.yml | 3 --- gitlab-build.sh | 16 ++++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) mode change 100644 => 100755 gitlab-build.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 081d1aea..abf6e568 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,9 +7,6 @@ pages: stage: deploy script: - ./gitlab-build.sh - - export artifacts: paths: - public - variables: - CI_DEBUG_TRACE: "true" diff --git a/gitlab-build.sh b/gitlab-build.sh old mode 100644 new mode 100755 index 93223754..f9f4a6de --- a/gitlab-build.sh +++ b/gitlab-build.sh @@ -28,13 +28,13 @@ sphinx-build -M latexpdf . public/$CI_COMMIT_BRANCH/ mv public/$CI_COMMIT_BRANCH/latex/beagleboard-docs.pdf public/$CI_COMMIT_BRANCH/ rm -rf public/$CI_COMMIT_BRANCH/latex -elif [ "$CI_COMMIT_TAG" != "" ]; then - -export GIT_BRANCH=$(git branch -a --contains tags/$CI_COMMIT_TAG | grep origin | sed 's/.*origin\///') -sphinx-build -b html . public/$GIT_BRANCH/ -sphinx-build -M latexpdf . public/$GIT_BRANCH/ -mv public/$GIT_BRANCH/latex/beagleboard-docs.pdf public/$GIT_BRANCH/beagleboard-docs-$CI_COMMIT_TAG.pdf -ln -s public/$GIT_BRANCH/latex/beagleboard-docs-$CI_COMMIT_TAG.pdf public/$GIT_BRANCH/beagleboard-docs.pdf -rm -rf public/$GIT_BRANCH/latex +# elif [ "$CI_COMMIT_TAG" != "" ]; then + +# export GIT_BRANCH=$(git branch -a --contains tags/$CI_COMMIT_TAG | grep origin | sed 's/.*origin\///') +# sphinx-build -b html . public/$GIT_BRANCH/ +# sphinx-build -M latexpdf . public/$GIT_BRANCH/ +# mv public/$GIT_BRANCH/latex/beagleboard-docs.pdf public/$GIT_BRANCH/beagleboard-docs-$CI_COMMIT_TAG.pdf +# ln -s public/$GIT_BRANCH/latex/beagleboard-docs-$CI_COMMIT_TAG.pdf public/$GIT_BRANCH/beagleboard-docs.pdf +# rm -rf public/$GIT_BRANCH/latex fi -- GitLab