Commit 0c82738e authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'qa-pass-url' into 'master' 

fix: use CI related variables from .gitlab-ci.yml

See merge request to-be-continuous/doc!76
parents 9b90dfd9 35d6f688

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ process-templates: 
    entrypoint: [""]

  stage: .pre

  script:

    - ./process-templates.sh --json-out kicker-aggregated.json --doc-out ./docs

    - ./process-templates.sh --api $CI_API_V4_URL --json-out kicker-aggregated.json --doc-out ./docs

  artifacts:

    name: "aggregated kicker json from $CI_COMMIT_REF_SLUG"

    paths:

process-templates.sh

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ function build_aggregated_toc() { 
}



# API url default to local GitLab instance

API_URL=${BASE_API_URL:-${CI_API_V4_URL:-https://gitlab.com/api/v4}}

API_URL=${BASE_API_URL:-https://gitlab.com/api/v4}

JSON_OUT=kicker-aggregated.json

IMAGES_OUT=tbc-default-images.out

DOC_OUT=./docs