Commit 1738638b authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '8-log-installed-bru_version' into 'master' 

Resolve "Log installed BRU_VERSION"

Closes #8

See merge request to-be-continuous/bruno!34
parents cf1006ef 12d5065e

templates/gitlab-ci-bruno.yml

+3 −1
Original line number Diff line number Diff line
@@ -421,6 +421,8 @@ bruno: 
    - maybe_exec_hook "./pre-bruno.sh"

    # run tests

    - |

      installed_version=$(npx --yes @usebruno/cli${BRU_VERSION:+@$BRU_VERSION} --version 2>/dev/null)

      log_info "Using Bruno CLI version \\e[33;1m${installed_version}\\e[0m"

      for collection in $BRU_COLLECTIONS

      do

        if [[ -d "$collection" ]] && [[ -f "$collection/bruno.json" ]]
@@ -429,7 +431,7 @@ bruno: 
          log_info "Running collection \\e[33;1m./${collection}\\e[0m..."

          namenopunct=$(basename $collection | tr '[:punct:]' '_')

          junit_report="$CI_PROJECT_DIR/reports/bruno-$namenopunct.xunit.xml"

          if ! npx --yes @usebruno/cli${BRU_VERSION:+@$BRU_VERSION} run -r --output "$junit_report" --format junit $cacerts_opt ${BRU_BASE_URL:+--env-var "base_url=$BRU_BASE_URL"} $BRU_EXTRA_ARGS

          if ! npx @usebruno/cli run -r --output "$junit_report" --format junit $cacerts_opt ${BRU_BASE_URL:+--env-var "base_url=$BRU_BASE_URL"} $BRU_EXTRA_ARGS

          then

            log_error "Collection \\e[33;1m./${collection}\\e[0m failed"

            rc=127