Commit 66c257c8 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

fix: sanitize variable substitution pattern 

replace '${foo+repl}' pattern with '${foo:+repl}' (latest supports $foo being defined but empty)

closes #21
parent 6f32f60c

templates/gitlab-ci-sonar.yml

+5 −5
Original line number Diff line number Diff line
@@ -426,11 +426,11 @@ sonar: 
      fi

    - >-

      sonar-scanner ${TRACE+-Dsonar.verbose=true} $java_proxy_args 

      ${SONAR_LOGIN+-Dsonar.login=$SONAR_LOGIN} 

      ${SONAR_PASSWORD+-Dsonar.password=$SONAR_PASSWORD} 

      ${SONAR_PROJECT_KEY+-Dsonar.projectKey=$SONAR_PROJECT_KEY} 

      ${SONAR_PROJECT_NAME+-Dsonar.projectName=$SONAR_PROJECT_NAME} 

      ${SONAR_QUALITY_GATE_ENABLED+-Dsonar.qualitygate.wait=$SONAR_QUALITY_GATE_ENABLED}

      ${SONAR_LOGIN:+-Dsonar.login=$SONAR_LOGIN} 

      ${SONAR_PASSWORD:+-Dsonar.password=$SONAR_PASSWORD} 

      ${SONAR_PROJECT_KEY:+-Dsonar.projectKey=$SONAR_PROJECT_KEY} 

      ${SONAR_PROJECT_NAME:+-Dsonar.projectName=$SONAR_PROJECT_NAME} 

      ${SONAR_QUALITY_GATE_ENABLED:+-Dsonar.qualitygate.wait=$SONAR_QUALITY_GATE_ENABLED}

      $SONAR_BASE_ARGS

  rules:

    - !reference [.test-policy, rules]