Loading .gitlab-ci.yml +32 −10 Changes for .gitlab-ci.yml: 32 added lines, 10 removed lines. Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ stages: - review - deploy - clean - linkchecker before_script: # https://docs.gitlab.com/ee/ci/ssh_keys/README.html Loading Loading @@ -62,8 +63,8 @@ pdf: pages:branches: stage: build script: - if [ -f book.json ]; then jq -r --arg base_path "/${CI_PROJECT_PATH}/~${CI_COMMIT_REF_NAME}/" '.base_path |= $base_path' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "/${CI_PROJECT_PATH}/~${CI_COMMIT_REF_NAME}/book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg base_path "${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/" '.base_path |= $base_path' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi - 'if [ -f book.json ]; then cat book.json; fi' - gitbook install - gitbook build Loading @@ -81,8 +82,8 @@ pages:branches: pages:master: stage: build script: - if [ -f book.json ]; then jq -r --arg base_path "/${CI_PROJECT_PATH}/" '.base_path |= $base_path' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "/${CI_PROJECT_PATH}/book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg base_path "${BASE_DIR}" '.base_path |= $base_path' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "${BASE_DIR}book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi - 'if [ -f book.json ]; then cat book.json; fi' - gitbook install - gitbook build Loading @@ -104,7 +105,7 @@ review:start: - chmod 644 ~/.ssh/known_hosts - eval $(ssh-agent -s) - echo "$REVIEW_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - echo ssh -p "${REVIEW_SSH_PORT}" "${REVIEW_SSH_USER}"@"${REVIEW_HOST_NAME}" "mkdir -p /usr/share/nginx/html/~${CI_COMMIT_REF_NAME}" - ssh -p "${REVIEW_SSH_PORT}" "${REVIEW_SSH_USER}"@"${REVIEW_HOST_NAME}" "mkdir -p /usr/share/nginx/html/~${CI_COMMIT_REF_NAME}" - scp -P "${REVIEW_SSH_PORT}" -r _book/* "${REVIEW_SSH_USER}"@"${REVIEW_HOST_NAME}":"/usr/share/nginx/html/~${CI_COMMIT_REF_NAME}" - if [ -d book_pdf ]; then ssh -p "${REVIEW_SSH_PORT}" "${REVIEW_SSH_USER}"@"${REVIEW_HOST_NAME}" "mkdir -p /usr/share/nginx/html/~${CI_COMMIT_REF_NAME}/book_pdf"; fi - if [ -d book_pdf ]; then scp -P "${REVIEW_SSH_PORT}" -r book_pdf/* "${REVIEW_SSH_USER}"@"${REVIEW_HOST_NAME}":"/usr/share/nginx/html/~${CI_COMMIT_REF_NAME}/book_pdf"; fi Loading @@ -118,7 +119,7 @@ review:start: - master environment: name: $CI_COMMIT_REF_NAME url: https://$REVIEW_PROXY_HOST_NAME/${CI_PROJECT_PATH}/~${CI_COMMIT_REF_NAME}/ url: https://${REVIEW_PROXY_HOST_NAME}${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/ on_stop: review:stop review:stop: Loading Loading @@ -158,10 +159,8 @@ deploy: - book_pdf policy: pull environment: name: _$CI_COMMIT_REF_NAME #url: http://$HOST_NAME$COLON$HTTP_PORT/production/ #url: https://$PROXY_HOST_NAME/$BASE_PATH/ url: https://$PROXY_HOST_NAME/$CI_PROJECT_PATH/ name: $CI_COMMIT_REF_NAME url: https://$PROXY_HOST_NAME${BASE_DIR} #url: https://$PROXY_HOST_NAME/ clean: Loading @@ -178,3 +177,26 @@ clean: environment: name: $CI_COMMIT_REF_NAME action: stop linkchecker:intern: stage: linkchecker except: - master image: name: linkchecker/linkchecker entrypoint: [""] script: - linkchecker --recursion-level 10 --threads 10 --no-status --no-robots --no-warnings --ignore-url 'https://fonts.gstatic.com/{0,1}$' https://${REVIEW_PROXY_HOST_NAME}${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/ when: manual linkchecker:all: stage: linkchecker except: - master image: name: linkchecker/linkchecker entrypoint: [""] script: - linkchecker --recursion-level 10 --threads 10 --no-status --no-robots --no-warnings --check-extern --ignore-url 'https://fonts.gstatic.com/{0,1}$' https://${REVIEW_PROXY_HOST_NAME}${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/ when: manual Loading
.gitlab-ci.yml +32 −10 Changes for .gitlab-ci.yml: 32 added lines, 10 removed lines. Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ stages: - review - deploy - clean - linkchecker before_script: # https://docs.gitlab.com/ee/ci/ssh_keys/README.html Loading Loading @@ -62,8 +63,8 @@ pdf: pages:branches: stage: build script: - if [ -f book.json ]; then jq -r --arg base_path "/${CI_PROJECT_PATH}/~${CI_COMMIT_REF_NAME}/" '.base_path |= $base_path' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "/${CI_PROJECT_PATH}/~${CI_COMMIT_REF_NAME}/book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg base_path "${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/" '.base_path |= $base_path' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi - 'if [ -f book.json ]; then cat book.json; fi' - gitbook install - gitbook build Loading @@ -81,8 +82,8 @@ pages:branches: pages:master: stage: build script: - if [ -f book.json ]; then jq -r --arg base_path "/${CI_PROJECT_PATH}/" '.base_path |= $base_path' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "/${CI_PROJECT_PATH}/book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg base_path "${BASE_DIR}" '.base_path |= $base_path' book.json | sponge book.json; fi - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "${BASE_DIR}book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi - 'if [ -f book.json ]; then cat book.json; fi' - gitbook install - gitbook build Loading @@ -104,7 +105,7 @@ review:start: - chmod 644 ~/.ssh/known_hosts - eval $(ssh-agent -s) - echo "$REVIEW_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - echo ssh -p "${REVIEW_SSH_PORT}" "${REVIEW_SSH_USER}"@"${REVIEW_HOST_NAME}" "mkdir -p /usr/share/nginx/html/~${CI_COMMIT_REF_NAME}" - ssh -p "${REVIEW_SSH_PORT}" "${REVIEW_SSH_USER}"@"${REVIEW_HOST_NAME}" "mkdir -p /usr/share/nginx/html/~${CI_COMMIT_REF_NAME}" - scp -P "${REVIEW_SSH_PORT}" -r _book/* "${REVIEW_SSH_USER}"@"${REVIEW_HOST_NAME}":"/usr/share/nginx/html/~${CI_COMMIT_REF_NAME}" - if [ -d book_pdf ]; then ssh -p "${REVIEW_SSH_PORT}" "${REVIEW_SSH_USER}"@"${REVIEW_HOST_NAME}" "mkdir -p /usr/share/nginx/html/~${CI_COMMIT_REF_NAME}/book_pdf"; fi - if [ -d book_pdf ]; then scp -P "${REVIEW_SSH_PORT}" -r book_pdf/* "${REVIEW_SSH_USER}"@"${REVIEW_HOST_NAME}":"/usr/share/nginx/html/~${CI_COMMIT_REF_NAME}/book_pdf"; fi Loading @@ -118,7 +119,7 @@ review:start: - master environment: name: $CI_COMMIT_REF_NAME url: https://$REVIEW_PROXY_HOST_NAME/${CI_PROJECT_PATH}/~${CI_COMMIT_REF_NAME}/ url: https://${REVIEW_PROXY_HOST_NAME}${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/ on_stop: review:stop review:stop: Loading Loading @@ -158,10 +159,8 @@ deploy: - book_pdf policy: pull environment: name: _$CI_COMMIT_REF_NAME #url: http://$HOST_NAME$COLON$HTTP_PORT/production/ #url: https://$PROXY_HOST_NAME/$BASE_PATH/ url: https://$PROXY_HOST_NAME/$CI_PROJECT_PATH/ name: $CI_COMMIT_REF_NAME url: https://$PROXY_HOST_NAME${BASE_DIR} #url: https://$PROXY_HOST_NAME/ clean: Loading @@ -178,3 +177,26 @@ clean: environment: name: $CI_COMMIT_REF_NAME action: stop linkchecker:intern: stage: linkchecker except: - master image: name: linkchecker/linkchecker entrypoint: [""] script: - linkchecker --recursion-level 10 --threads 10 --no-status --no-robots --no-warnings --ignore-url 'https://fonts.gstatic.com/{0,1}$' https://${REVIEW_PROXY_HOST_NAME}${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/ when: manual linkchecker:all: stage: linkchecker except: - master image: name: linkchecker/linkchecker entrypoint: [""] script: - linkchecker --recursion-level 10 --threads 10 --no-status --no-robots --no-warnings --check-extern --ignore-url 'https://fonts.gstatic.com/{0,1}$' https://${REVIEW_PROXY_HOST_NAME}${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/ when: manual