Skip to content

Commit

Permalink
Merge branch 'main' into orthogonal_seedconf
Browse files Browse the repository at this point in the history
  • Loading branch information
paulgessinger authored Aug 7, 2023
2 parents 9b004c2 + 3f4cbab commit ad69cd5
Show file tree
Hide file tree
Showing 152 changed files with 2,243 additions and 1,156 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,10 @@ jobs:
- name: Python level tests
shell: bash
env:
PYTEST_MD_REPORT: true
PYTEST_MD_REPORT_VERBOSE: 0
PYTEST_MD_REPORT_OUTPUT: pytest.md
run: >
/usr/local/bin/geant4-config --install-datasets
&& source /usr/local/bin/thisroot.sh
Expand All @@ -266,7 +270,9 @@ 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
&& pip3 install pytest-md-report
&& pytest -rFsv -k "not exatrkx" -v
&& cat ${PYTEST_MD_REPORT_OUTPUT} >> $GITHUB_STEP_SUMMARY
linux_physmon:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -314,6 +320,7 @@ jobs:
&& echo "::endgroup::"
&& export PYTHONPATH="${PYTHONPATH}":"${GITHUB_WORKSPACE}/Examples/Scripts/Python"
&& CI/physmon/phys_perf_mon.sh all physmon
&& cat physmon/summary.md >> $GITHUB_STEP_SUMMARY
- uses: actions/upload-artifact@v3
if: always()
Expand Down Expand Up @@ -401,7 +408,7 @@ jobs:
-DACTS_BUILD_ODD=ON
-DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-DACTS_FORCE_ASSERTIONS=ON
-DACTS_FORCE_ASSERTIONS=OFF
-DACTS_BUILD_ANALYSIS_APPS=ON
-DACTS_BUILD_PLUGIN_ACTSVG=ON
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,14 @@ jobs:
- name: Render comment
if: steps.get-pr-number.outputs.result != 'false'
run: |
pip install Jinja2
ls -al $GITHUB_WORKSPACE/physmon
CI/physmon/generate_comment.py $GITHUB_WORKSPACE/physmon comment.md
echo "# 📊: Physics performance monitoring for ${PR_SHA}" >> comment.md
echo "[Full contents](${ARTIFACT_URL})" >> comment.md
if [ -f "$GITHUB_WORKSPACE/physmon/summary.md" ]; then
cat $GITHUB_WORKSPACE/physmon/summary.md >> comment.md
else
echo "🟥 summary not found!" >> comment.md
fi
cat comment.md
- name: Find Comment
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/trigger_athena.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ jobs:
curl -X POST --fail
-F token=${{ secrets.GITLAB_ATHENA_BUILD_TRIGGER_TOKEN}}
-F ref=main
--form variables[SOURCE_SHA]="${{ github.sha }}"
https://gitlab.cern.ch/api/v4/projects/153873/trigger/pipeline
2 changes: 1 addition & 1 deletion .policy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ approval_rules:
options:
allow_author: false # just for completeness
allow_contributor: true # Update button 'contributions' should be ignored
invalidate_on_push: false
invalidate_on_push: true
ignore_update_merges: true
if:
targets_branch:
Expand Down
167 changes: 0 additions & 167 deletions CI/physmon/comment_template.md

This file was deleted.

100 changes: 0 additions & 100 deletions CI/physmon/generate_comment.py

This file was deleted.

Loading

0 comments on commit ad69cd5

Please sign in to comment.