diff --git a/dist/codecov.sh b/dist/codecov.sh index f1c23a6..832d201 100755 --- a/dist/codecov.sh +++ b/dist/codecov.sh @@ -37,7 +37,7 @@ g="\033[0;32m" # info/debug r="\033[0;31m" # errors x="\033[0m" retry="--retry 5 --retry-delay 2" -CC_WRAPPER_VERSION="0.3.0" +CC_WRAPPER_VERSION="0.3.1" CC_VERSION="${CC_VERSION:-latest}" CC_FAIL_ON_ERROR="${CC_FAIL_ON_ERROR:-false}" CC_RUN_CMD="${CC_RUN_CMD:-upload-coverage}" diff --git a/env b/env index f0e8c84..35bdc95 100644 --- a/env +++ b/env @@ -1,26 +1,52 @@ +CC_ARGS CC_AUTO_LOAD_PARAMS_FROM CC_BASE_SHA +CC_BINARY +CC_BINARY_LOCATION CC_BRANCH CC_BUILD CC_BUILD_URL +CC_CLEANUP +CC_CLI_ARGS +CC_CLI_TYPE CC_CODE +CC_COMMAND CC_DIR +CC_DOWNLOAD_DIR +CC_DOWNLOAD_ONLY CC_ENTERPRISE_URL CC_ENV +CC_EXCLUDES +CC_FAIL_ON_ERROR +CC_FILENAME +CC_FILES +CC_FLAGS CC_GCOV_ARGS CC_GCOV_EXECUTABLE CC_GCOV_IGNORE CC_GCOV_INCLUDE CC_GIT_SERVICE CC_JOB_CODE +CC_NAME CC_NETWORK_FILTER CC_NETWORK_PREFIX CC_NETWORK_ROOT_FOLDER +CC_OS CC_PARENT_SHA +CC_PLUGINS CC_PR CC_REPORT_TYPE +CC_RUN_CMD CC_SERVICE CC_SHA +CC_SKIP_VALIDATION CC_SLUG CC_SWIFT_PROJECT +CC_TOKEN +CC_TOKEN_VAR +CC_URL +CC_USE_PYPI +CC_VERSION +CC_WRAPPER_VERSION +CC_YML_PATH diff --git a/package.py b/package.py index 7dfd0e3..464303a 100644 --- a/package.py +++ b/package.py @@ -25,16 +25,15 @@ def package_scripts(source_dir, source_root, outfile): f.write(f'{var}\n') def _get_vars(line): - matcher = r'(CODECOV_[\w_]+)' - matches = re.search(matcher, line) - if matches and matches.groups(): - return matches.groups()[0] - matcher = r'v_arg ([\w_]+)' matches = re.search(matcher, line) if matches and matches.groups(): return f"CC_{matches.groups()[0]}" + matcher = r'(CC_[\w_]+)' + matches = re.search(matcher, line) + if matches and matches.groups(): + return matches.groups()[0] return '' def _parse(file): @@ -63,4 +62,3 @@ def _get_script_from_line(line): if __name__=="__main__": package_scripts('scripts', 'run.sh', 'dist/codecov.sh') - package_scripts('scripts', 'run.sh', 'dist/prevent.sh') diff --git a/scripts/set_defaults.sh b/scripts/set_defaults.sh index 3cba430..eaf10ad 100755 --- a/scripts/set_defaults.sh +++ b/scripts/set_defaults.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -CODECOV_WRAPPER_VERSION="0.3.0" +CODECOV_WRAPPER_VERSION="0.3.1" CODECOV_VERSION="${CODECOV_VERSION:-latest}" CODECOV_FAIL_ON_ERROR="${CODECOV_FAIL_ON_ERROR:-false}" CODECOV_RUN_CMD="${CODECOV_RUN_CMD:-upload-coverage}"