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.

Sign up for GitHub

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

ci: Fix skipped Geant4 tests, always enable all tests by default in CI #2032

Merged
merged 6 commits into from
Apr 17, 2023
Merged

ci: Fix skipped Geant4 tests, always enable all tests by default in CI #2032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1cf45c4
try preventing skips in the CI
paulgessinger Apr 13, 2023
2886b64
decorator
paulgessinger Apr 13, 2023
799681d
just force everything to enabled
paulgessinger Apr 13, 2023
12edc4f
detect G4, explicitly disable exatrkx
paulgessinger Apr 14, 2023
a2ed20a
update hashes for G4 test
paulgessinger Apr 14, 2023
eb6688f
Merge branch 'main' into ci/noskips
paulgessinger Apr 17, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ jobs:
&& export PYTHONPATH=/usr/local/python:$PYTHONPATH
&& export LD_LIBRARY_PATH=$PWD/build/thirdparty/OpenDataDetector/factory:$LD_LIBRARY_PATH
&& pip3 install -r Examples/Python/tests/requirements.txt
&& pytest -rFsv -v
&& pytest -rFsv -k "not exatrkx" -v

linux_physmon:
runs-on: ubuntu-latest
Expand Down
10 changes: 9 additions & 1 deletion Examples/Python/tests/helpers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
import acts
from acts.examples import IAlgorithm

geant4Enabled = any(v.startswith("G4") for v in os.environ.keys())
geant4Enabled = (
any(v.startswith("G4") for v in os.environ.keys())
or "GEANT4_DATA_DIR" in os.environ
)
if geant4Enabled:
try:
import acts.examples.geant4
Expand Down Expand Up @@ -80,6 +83,11 @@

isCI = os.environ.get("CI", "false") == "true"

if isCI:
for k, v in dict(locals()).items():
if k.endswith("Enabled"):
locals()[k] = True


class AssertCollectionExistsAlg(IAlgorithm):
events_seen = 0
Expand Down
6 changes: 3 additions & 3 deletions Examples/Python/tests/root_file_hashes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ test_pythia8__pythia8_particles.root: bf2ddabd7ad7aee83e18c3fb83627fed6541c776ab
test_fatras__particles_final.root: 0bfe4bbac90b112fd960b39cd5edd7d19fb9b8e308f8315db0871bfae061b550
test_fatras__particles_initial.root: 0e2d9974fdd4aa5549c5c05817ec54fe6c7d9cbe7969647f227956167e31110d
test_fatras__hits.root: d46b760e1647ab94c49d6976a78ee5a6178d41c45f2238f86f3987938a7901fb
test_geant4__particles_final.root: e1ec3b70e55a818d8df4b20ac4f6410d6cfd3b8257d5edc6726193968afe16d2
test_geant4__particles_initial.root: 1295ba626c4283b95b2bf50be35261e16c7594a537540ce55bd2c143db71b026
test_geant4__hits.root: 33797fd51d50b92023fef3700c2fdc029b73ec92cf5aa10c22388ffd8871d5cf
test_geant4__particles_final.root: ba00c21e6f0696316000f5ff7f0fb27df72d191157043bfa815844d8897056b7
test_geant4__particles_initial.root: 9eea306cd4ece5f509d73c0cc8de1bd321b2b40646bfcd5cc148a7ccf77980d8
test_geant4__hits.root: 6ab07fe4fe596c6948d7c4b821e51f6fae4ba69ac5cc62c07798c7de1cedfccb
test_seeding__estimatedparams.root: fe5ce98fb6b6886e05f5e6c17e037c898017a48201534b07bc56ccbf672c7a33
test_seeding__performance_seeding.root: 992f9c611d30dde0d3f3ab676bab19ada61ab6a4442828e27b65ec5e5b7a2880
test_seeding__particles.root: 74e08ee12bdaf9f7d273369c71c742df345475c8b73bb7ce223619d0dd1f87ee
Expand Down