Commit ef094324 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

fix(yarn): remove deprecated --cache-folder option

parent 6a558152

templates/gitlab-ci-node.yml

+11 −6
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ stages: 
  function sonar_lint_report() {

    if [[ -n "$SONAR_URL" ]]

    then

      mkdir -p reports

      mkdir -p -m 777 reports

      # generate eslint report in json for SonarQube

      # shellcheck disable=SC2086

      $NODE_MANAGER $NODE_LINT_ARGS -- --format=json --output-file=reports/eslint-report.json
@@ -281,6 +281,11 @@ stages: 
  services:

    - name: "$TBC_TRACKING_IMAGE"

      command: ["--service", "node", "3.0.0" ]

  variables:

    # Yarn cache (better than --cache-folder option, deprecated)

    YARN_CACHE_FOLDER: $NODE_PROJECT_DIR/.yarn

    # NPM cache

    npm_config_cache: $NODE_PROJECT_DIR/.npm

  # Cache downloaded dependencies and plugins between builds.

  # To keep cache across branches add 'key: "$CI_JOB_NAME"'

  cache:
@@ -291,17 +296,17 @@ stages: 
  before_script:

    - *node-scripts

    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"

    - guess_node_manager_system

    - cd ${NODE_PROJECT_DIR}

    - guess_node_manager_system

    - config_registry=${NODE_CONFIG_REGISTRY:-$NPM_CONFIG_REGISTRY}

    - if [[ "$config_registry" ]]; then $NODE_MANAGER config set registry $config_registry; fi

    - |

      case "$NODE_MANAGER" in

      npm)

        npm ci --cache .npm --prefer-offline

        npm ci --prefer-offline

        ;;

      yarn)

        yarn install --immutable --immutable-cache --check-cache --cache-folder .yarn

        yarn install --immutable --immutable-cache --check-cache

      ;;

      esac
@@ -358,7 +363,7 @@ node-audit: 
  extends: .node-base

  stage: test

  script:

    - mkdir -p reports

    - mkdir -p -m 777 reports

    - |

      if ! $NODE_MANAGER audit $NODE_AUDIT_ARGS

      then
@@ -382,7 +387,7 @@ node-outdated: 
  extends: .node-base

  stage: test

  script:

    - mkdir -p reports

    - mkdir -p -m 777 reports

    - |

      if ! $NODE_MANAGER outdated $NODE_OUTDATED_ARGS

      then