Commit d2a30e78 authored by Federico Falconieri's avatar Federico Falconieri
Browse files

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

feat: provide direct html link

See merge request just-ci/templates!72
parents 1371f3fc 41fcb4dc

docs/md-presentation-badges.yml

+8 −1
Original line number Diff line number Diff line
@@ -33,9 +33,16 @@ badge:html: 
    URL: "${HTML}"

    BADGE_NAME: html



badge:html-zip:

  extends: .badge:md-presentation

  variables:

    VALUE: html.zip - ${CI_COMMIT_REF_NAME}

    URL: "${HTML_ZIP}"

    BADGE_NAME: html-zip



badge:images:

  extends: .badge:md-presentation

  variables:

    VALUE: images - ${CI_COMMIT_REF_NAME}

    VALUE: images.zip - ${CI_COMMIT_REF_NAME}

    URL: "${IMAGES}"

    BADGE_NAME: images

docs/md-presentation.yml

+11 −1
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Running a local webserver of MARP is as easy as:

# docker run --rm -ti -p 127.0.0.1:8080:8080 -v "${PWD}:/pwd" -w /pwd docker.io/marpteam/marp-cli:latest -s .



# This currently assumes a single presentation. Having more will probably work fine, but may provide unexpected results.



docs:md-presentation:

  image:

    name: docker.io/marpteam/marp-cli:latest
@@ -24,9 +26,15 @@ docs:md-presentation: 
    - zip -r ${CI_PROJECT_DIR}/output/html.zip *.* -x *.md -x

      ${CI_PROJECT_DIR}/output

    - rm ${OUTPUT_FILES}

    - unzip ${CI_PROJECT_DIR}/output/html.zip -d ${CI_PROJECT_DIR}/html-output

    - HTML_FILENAME=$(basename $(ls ${CI_PROJECT_DIR}/html-output/*.html | head

      -n1))

    - echo

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

      "HTML=${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/file/html-output/${HTML_FILENAME}"

      > ${CI_PROJECT_DIR}/links.env

    - echo

      "HTML_ZIP=${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}
@@ -57,9 +65,11 @@ docs:md-presentation: 
          echo "${EXT}=${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/output/${BASENAME}" >> ${CI_PROJECT_DIR}/links.env

        fi

      done

      echo -e "[+] View \033[1m${HTML_FILENAME}\033[0m from ${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/file/html-output/${HTML_FILENAME}"

  artifacts:

    when: always

    paths:

      - output

      - html-output

    reports:

      dotenv: links.env