diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml index 8753a369..a2233c8b 100644 --- a/.circleci/test-deploy.yml +++ b/.circleci/test-deploy.yml @@ -66,6 +66,7 @@ jobs: version: v0.2.2 - codecov/upload: flags: string_flag,ENV_VAR_CONTAINING_FLAG + - codecov/upload environment: ENV_VAR_CONTAINING_FLAG: env_var_flag test-linux: @@ -88,6 +89,7 @@ jobs: version: v0.2.2 - codecov/upload: flags: string_flag,ENV_VAR_CONTAINING_FLAG + - codecov/upload environment: ENV_VAR_CONTAINING_FLAG: env_var_flag test-macos: @@ -110,6 +112,7 @@ jobs: version: v0.2.2 - codecov/upload: flags: string_flag,ENV_VAR_CONTAINING_FLAG + - codecov/upload environment: ENV_VAR_CONTAINING_FLAG: env_var_flag test-windows: @@ -133,6 +136,7 @@ jobs: version: v0.2.2 - codecov/upload: flags: string_flag,ENV_VAR_CONTAINING_FLAG + - codecov/upload environment: ENV_VAR_CONTAINING_FLAG: env_var_flag diff --git a/package-lock.json b/package-lock.json index b7284a64..ad6bf231 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "codecov-circleci-orb", - "version": "4.0.0", + "version": "4.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "codecov-circleci-orb", - "version": "4.0.0", + "version": "4.0.1", "license": "MIT", "devDependencies": { "@types/mocha": "^9.1.0", diff --git a/package.json b/package.json index 002a6551..1fcd2d82 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codecov-circleci-orb", - "version": "4.0.0", + "version": "4.0.1", "description": "Codecov CircleCI Orb", "main": "index.js", "devDependencies": { diff --git a/src/examples/basic_upload.yml b/src/examples/basic_upload.yml index dbe61329..3234644e 100644 --- a/src/examples/basic_upload.yml +++ b/src/examples/basic_upload.yml @@ -5,7 +5,7 @@ description: > usage: version: 2.1 orbs: - codecov: codecov/codecov@3.2.5 + codecov: codecov/codecov@4.0.1 jobs: test-and-upload-python: docker: diff --git a/src/examples/node_test_upload.yml b/src/examples/node_test_upload.yml index fab9e47a..c35f239a 100644 --- a/src/examples/node_test_upload.yml +++ b/src/examples/node_test_upload.yml @@ -7,7 +7,7 @@ usage: version: 2.1 orbs: node: circleci/node@4.7.0 - codecov: codecov/codecov@3.2.5 + codecov: codecov/codecov@4.0.1 workflows: upload-to-codecov: jobs: diff --git a/src/scripts/upload.sh b/src/scripts/upload.sh index 859010f1..982cf44f 100755 --- a/src/scripts/upload.sh +++ b/src/scripts/upload.sh @@ -29,13 +29,21 @@ for flag in $PARAM_FLAGS; do done IFS=$OLDIFS +if [ -n "$FLAGS" ]; then + FLAGS="-F ${FLAGS}" +fi + #create commit +echo "./\"$codecov_filename\" ${PARAM_CLI_ARGS} create-commit -t " + ./"$codecov_filename" \ ${PARAM_CLI_ARGS} \ create-commit \ -t "$(eval echo \$$PARAM_TOKEN)" #create report +echo "./\"$codecov_filename\" ${PARAM_CLI_ARGS} create-report -t " + ./"$codecov_filename" \ ${PARAM_CLI_ARGS} \ create-report \ @@ -43,11 +51,14 @@ IFS=$OLDIFS #upload reports # alpine doesn't allow for indirect expansion + +echo "./${codecov_filename} ${PARAM_CLI_ARGS} do-upload -t -n \"${PARAM_UPLOAD_NAME}\" ${FLAGS} ${PARAM_UPLOAD_ARGS} ${@}" + ./"$codecov_filename" \ ${PARAM_CLI_ARGS} \ do-upload \ -t "$(eval echo \$$PARAM_TOKEN)" \ -n "${PARAM_UPLOAD_NAME}" \ - -F "${FLAGS}" \ + ${FLAGS} \ ${PARAM_UPLOAD_ARGS} \ ${@}