Merge pull request #167 from codecov/joseph/circle-build-num-and-env-…

…var-flags

Fix CIRCLE_BUILD_NUM bug and allows users to specify env vars as flags

.circleci/test-deploy.yml

@@ -63,6 +63,10 @@ jobs:
           file: coverage/coverage-final.json
           flags: alpine
           version: v0.1.0_8880
+      - codecov/upload:
+          flags: string_flag,ENV_VAR_CONTAINING_FLAG
+    environment:
+      ENV_VAR_CONTAINING_FLAG: env_var_flag
   test-linux:
     docker:
       - image: cimg/base:stable
@@ -80,6 +84,10 @@ jobs:
           file: coverage/coverage-final.json
           flags: linux
           version: v0.1.0_8880
+      - codecov/upload:
+          flags: string_flag,ENV_VAR_CONTAINING_FLAG
+    environment:
+      ENV_VAR_CONTAINING_FLAG: env_var_flag
   test-macos:
     macos:
       xcode: 14.1
@@ -97,6 +105,10 @@ jobs:
           file: coverage/coverage-final.json
           flags: macos
           version: v0.1.0_8880
+      - codecov/upload:
+          flags: string_flag,ENV_VAR_CONTAINING_FLAG
+    environment:
+      ENV_VAR_CONTAINING_FLAG: env_var_flag
   test-windows:
     executor:
       name: win/default
@@ -115,6 +127,10 @@ jobs:
           file: coverage/coverage-final.json
           flags: windows
           version: v0.1.0_8880
+      - codecov/upload:
+          flags: string_flag,ENV_VAR_CONTAINING_FLAG
+    environment:
+      ENV_VAR_CONTAINING_FLAG: env_var_flag
 
 workflows:
   integration-tests_deploy:

src/commands/upload.yml

@@ -13,7 +13,8 @@ parameters:
     default: ""
   flags:
     description: Flag the upload to group coverage metrics (e.g. unittests
-      | integration | ui,chrome)
+      | integration | ui,chrome). Flags can be input as strings or
+      environment variables.
     type: string
     default: ""
   token:
@@ -24,7 +25,7 @@ parameters:
   upload_name:
     description: Custom defined name of the upload. Visible in Codecov UI
     type: string
-    default: ${CIRCLE_BUILD_NUM}
+    default: ""
   validate:
     description: Validate the uploader before uploading the codecov result.
     type: boolean

src/scripts/upload.sh

@@ -6,10 +6,30 @@ chmod +x $codecov_filename
   set - "${@}" "-f" "${PARAM_FILE}"
 [ -n "${PARAM_XTRA_ARGS}" ] && \
   set - "${@}" "${PARAM_XTRA_ARGS}"
+[ -n "${PARAM_UPLOAD_NAME}" ] && \
+  PARAM_UPLOAD_NAME="${CIRCLE_BUILD_NUM}"
+
+FLAGS=""
+OLDIFS=$IFS;IFS=,
+for flag in $PARAM_FLAGS; do
+  eval e="\$$flag"
+  for param in "${e}" "${flag}"; do
+    if [ -n "${param}" ]; then
+      if [ -n "${FLAGS}" ]; then
+        FLAGS="${FLAGS},${param}"
+      else
+        FLAGS="${param}"
+      fi
+      break
+    fi
+  done
+done
+IFS=$OLDIFS
+
 # alpine doesn't allow for indirect expansion
 ./"$codecov_filename" \
   -Q "codecov-circleci-orb-3.2.5" \
   -t "$(eval echo \$$PARAM_TOKEN)" \
   -n "${PARAM_UPLOAD_NAME}" \
-  -F "${PARAM_FLAGS}" \
+  -F "${FLAGS}" \
   ${@}