Skip to content

Merge artdaq/Spack0.28 into artdaq/Spack1.1 #65

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

Closed
eflumerf wants to merge 7 commits into from
Closed

Merge artdaq/Spack0.28 into artdaq/Spack1.1 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bf602f
Py adds for run info tests at MC2
Feb 18, 2026
542a402
Update branches for push and pull_request events
eflumerf Feb 18, 2026
c1e95c5
Change organization from 'art-daq' to 'Mu2e'
eflumerf Feb 18, 2026
4cf0436
Change organization from art-daq to Mu2e
eflumerf Feb 18, 2026
be48d5b
Update PROJECT_NUMBER in track_new_issues.yml
eflumerf Feb 18, 2026
9fa324d
Update PROJECT_NUMBER in track_new_prs.yml
eflumerf Feb 18, 2026
48085e6
Merge pull request #64 from Mu2e/rrivera/pyAddsForRunInfo
eflumerf Feb 18, 2026
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
5 changes: 3 additions & 2 deletions .github/workflows/git-whitespace.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ name: Git Whitespace Check Workflow
on:
push:
branches:
- develop
- artdaq/Spack0.28
- artdaq/Spack1.1
paths-ignore:
- 'docs/**'
- '.github/**'
pull_request:
branches: [ develop ]
branches: [ artdaq/Spack0.28, artdaq/Spack1.1 ]
schedule:
- cron: "0 7 * * *"
workflow_dispatch:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/track_new_issues.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
- name: Get project data
env:
GITHUB_TOKEN: ${{ secrets.BOT_CI_ISSUES }}
ORGANIZATION: art-daq
PROJECT_NUMBER: 1
ORGANIZATION: Mu2e
PROJECT_NUMBER: 6
run: |
gh api graphql -f query='
query($org: String!, $number: Int!) {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/track_new_prs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
- name: Get project data
env:
GITHUB_TOKEN: ${{ secrets.BOT_CI_ISSUES }}
ORGANIZATION: art-daq
PROJECT_NUMBER: 1
ORGANIZATION: Mu2e
PROJECT_NUMBER: 6
run: |
gh api graphql -f query='
query($org: String!, $number: Int!) {
Expand Down
2 changes: 2 additions & 0 deletions packages/otsdaq-mu2e-trigger/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ def setup_run_environment(self, env):
env.prepend_path("CET_PLUGIN_PATH", prefix.lib)
# Ensure we can find fhicl files
env.prepend_path("FHICL_FILE_PATH", prefix + "/fcl")
env.prepend_path("PYTHONPATH", prefix.python)
# Cleaup.
sanitize_environments(env, "CET_PLUGIN_PATH", "FHICL_FILE_PATH")

Expand All @@ -80,5 +81,6 @@ def setup_dependent_run_environment(self, env, dependent_spec):
env.prepend_path("CET_PLUGIN_PATH", prefix.lib)
# Ensure we can find fhicl files
env.prepend_path("FHICL_FILE_PATH", prefix + "/fcl")
env.prepend_path("PYTHONPATH", prefix.python)
# Cleaup.
sanitize_environments(env, "CET_PLUGIN_PATH", "FHICL_FILE_PATH")