Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change CI test data to repo hosted on GIN #268

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,6 @@ workflows:
test_data_cache_version: ["5"]
filters:
tags:
only: /AFNI_\d\d.\d.\d\d/
ignore: /.*/
branches:
only: /.*/
ignore: /.*/
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "tests/afni_ci_test_data"]
path = tests/afni_ci_test_data
url = https://github.com/afni/afni_ci_test_data.git
url = https://gin.g-node.org/leej3/afni_ci_test_data.git
2 changes: 1 addition & 1 deletion tests/afni_ci_test_data
Submodule afni_ci_test_data updated from d24472 to 2077ef
2 changes: 1 addition & 1 deletion tests/afni_test_utils/data_management.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def get_tests_data_dir(config_obj):
logger.warn("Installing test data")
datalad.install(
str(tests_data_dir),
"https://github.com/afni/afni_ci_test_data.git",
"https://gin.g-node.org/leej3/afni_ci_test_data",
recursive=True,
on_failure="stop",
)
Expand Down
5 changes: 1 addition & 4 deletions tests/afni_test_utils/run_tests_func.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ def run_tests(tests_dir, **args_dict):
# append gcovr to assemble coverage report for C code
cmd += f"; gcovr -s --xml -o {tests_dir}/gcovr_output.xml -r {args_dict['build_dir']}/src"
# append command for compiling and uploading codecov report

# apparently there is a security issue here, must investigate
# cmd += "; bash -c 'bash <(curl -s https://codecov.io/bash)'"
# sys.exit(1)
cmd += "; bash -c 'bash <(curl -s https://codecov.io/bash)'"

print(f"Executing: {cmd}")
res = subprocess.run(cmd, shell=True, env=os.environ.copy())
Expand Down
4 changes: 1 addition & 3 deletions tests/scripts/test_testing_script_functionality.py
Original file line number Diff line number Diff line change
Expand Up @@ -718,9 +718,7 @@ def test_run_tests_container_subparsers_works(monkeypatch, argslist, mocked_scri
"ARGS='{DEFAULT_ARGS} {PYTEST_COV_FLAGS}' "
"ninja pytest;"
" gcovr -s --xml -o {TESTS_DIR}/gcovr_output.xml -r {params['args_in']['build_dir']}/src;"
" echo ======= REFUSING TO GO TO codecov.io ======== "
# there may be a security issue with getting the script this way
# " bash -c 'bash <(curl -s https://codecov.io/bash)'"
" bash -c 'bash <(curl -s https://codecov.io/bash)'"
),
},
],
Expand Down