Commit 170c17d4 authored by Federico Falconieri's avatar Federico Falconieri
Browse files

Merge branch 'rhtenhove-main-patch-56176' into 'main' 

fix: fail on failure

See merge request just-ci/templates!74
parents 0dca009a 11c6433a

docs/md-presentation.yml

+18 −8
Original line number Diff line number Diff line
@@ -17,18 +17,28 @@ docs:md-presentation: 
    - mkdir -p ${CI_PROJECT_DIR}/output



    # First the HTML export

    - marp-cli.js -I ${CONVERSION_PATH} ${DEFAULT_ARGS} ${EXTRA_ARGS} 2>&1 | tee /tmp/output.log

    - OUTPUT_FILES=$(cat /tmp/output.log | grep "=>" | cut -d">" -f2 | cut -d" " -f2)

    - zip -r ${CI_PROJECT_DIR}/output/html.zip *.* -x *.md -x ${CI_PROJECT_DIR}/output

    - marp-cli.js -I ${CONVERSION_PATH} ${DEFAULT_ARGS} ${EXTRA_ARGS} 2>&1 | tee

      /tmp/output.log

    - OUTPUT_FILES=$(cat /tmp/output.log | grep "=>" | cut -d">" -f2 | cut -d" "

      -f2)

    - zip -r ${CI_PROJECT_DIR}/output/html.zip *.* -x *.md -x

      ${CI_PROJECT_DIR}/output

    - rm ${OUTPUT_FILES}

    - echo "HTML=${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/output/html.zip" > ${CI_PROJECT_DIR}/links.env

    - echo

      "HTML=${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/output/html.zip"

      > ${CI_PROJECT_DIR}/links.env



    # Next the images export

    - marp-cli.js --images -I ${CONVERSION_PATH} ${DEFAULT_ARGS} ${EXTRA_ARGS} 2>&1 | tee /tmp/output.log

    - OUTPUT_FILES=$(cat /tmp/output.log | grep "=>" | cut -d">" -f2 | cut -d" " -f2)

    - zip -r ${CI_PROJECT_DIR}/output/images.zip *.png -x *.md -x ${CI_PROJECT_DIR}/output

    - marp-cli.js --images -I ${CONVERSION_PATH} ${DEFAULT_ARGS} ${EXTRA_ARGS}

      2>&1 | tee /tmp/output.log

    - OUTPUT_FILES=$(cat /tmp/output.log | grep "=>" | cut -d">" -f2 | cut -d" "

      -f2)

    - zip -r ${CI_PROJECT_DIR}/output/images.zip *.png -x *.md -x

      ${CI_PROJECT_DIR}/output

    - rm ${OUTPUT_FILES}

    - echo "IMAGES=${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/output/images.zip" >> ${CI_PROJECT_DIR}/links.env

    - echo

      "IMAGES=${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/output/images.zip"

      >> ${CI_PROJECT_DIR}/links.env



    # Finally the PDF and PPTX

    - |

docs/prettier.yml

+1 −0
Original line number Diff line number Diff line
@@ -13,4 +13,5 @@ docs:prettier: 
      if ! prettier ${DEFAULT_ARGS} ${EXTRA_ARGS} ${CHECK_PATH}; then

        echo "[!] Run the following in the root of your repository: \

        prettier --write --ignore-unknown ${EXTRA_ARGS} ${CHECK_PATH}"

        exit 1

      fi