Skip to content

Commit 5e5818d

Browse files
authored
Merge branch 'develop' into scorrodi/kpp
2 parents a89f87b + e77c672 commit 5e5818d

23 files changed

Lines changed: 881 additions & 27 deletions

.github/copilot-instructions.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Project Overview
2+
3+
This repository is part of the Mu2e TDAQ suite, based on the artdaq and otsdaq data acquisition frameworks.
4+
5+
## Libraries and Frameworks
6+
7+
otsdaq-mu2e is built using CMake and the Spack package manager. A build environment is provided in the `docker.io/eflumerf/mu2e-spack` Docker image, which includes all necessary dependencies and tools for building. The build environment is located at /opt/mu2edaq within the container.
8+
9+
## Coding Standards
10+
11+
All C++ source files must be formatted with `clang-format`. C/C++ header files should be formatted with `clang-format` using the `.clang-format-hpp` instruction file if it exists, `.clang-format` otherwise. All python files must be formatted with `black`. The project uses the Google C++ Style Guide as a reference for coding standards, with some modifications to fit the specific needs of the otsdaq framework. Developers are encouraged to follow these guidelines to maintain consistency and readability across the codebase.

.github/workflows/auto_approve.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Auto approve
22

33
on:
44
workflow_dispatch:
5-
inputs:
5+
inputs:
66
pullRequestNumber:
77
description: Pull request number to auto-approve
88
required: false

.github/workflows/git-whitespace.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Git Whitespace Check Workflow
22

33
on:
44
push:
5-
branches:
5+
branches:
66
- develop
77
paths-ignore:
88
- 'docs/**'

.github/workflows/mu2e-build-single-pkg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build Single Pkg Workflow
22

33
on:
44
push:
5-
branches:
5+
branches:
66
- develop
77
paths-ignore:
88
- 'docs/**'

.github/workflows/mu2e-develop-cpp-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: build-develop
44
# or API.
55
on:
66
push:
7-
branches-ignore:
7+
branches-ignore:
88
- develop
99
- stable
1010
paths-ignore:
@@ -20,5 +20,5 @@ on:
2020

2121
jobs:
2222
build_against_dev_release:
23-
name: Build against develop
23+
name: Build against develop
2424
uses: Mu2e/.github/.github/workflows/mu2e-develop-cpp-ci.yml@stable

.github/workflows/mu2e-format-single-pkg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Format Single Pkg Workflow
22

33
on:
44
push:
5-
branches:
5+
branches:
66
- develop
77
paths-ignore:
88
- 'docs/**'

.github/workflows/mu2e-test-single-pkg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Test Single Pkg Workflow
22

33
on:
44
push:
5-
branches:
5+
branches:
66
- develop
77
paths-ignore:
88
- 'docs/**'

.github/workflows/mu2e-tidy-single-pkg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Tidy Single Pkg Workflow
22

33
on:
44
push:
5-
branches:
5+
branches:
66
- develop
77
paths-ignore:
88
- 'docs/**'

.github/workflows/track_new_issues.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
}' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
2525
2626
echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
27-
27+
2828
- name: Add issue to project
2929
env:
3030
GITHUB_TOKEN: ${{ secrets.BOT_CI_ISSUES }}
@@ -37,4 +37,4 @@ jobs:
3737
id
3838
}
3939
}
40-
}' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
40+
}' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"

.github/workflows/track_new_prs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
}' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
2424
2525
echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
26-
26+
2727
- name: Add issue to project
2828
env:
2929
GITHUB_TOKEN: ${{ secrets.BOT_CI_ISSUES }}
@@ -36,4 +36,4 @@ jobs:
3636
id
3737
}
3838
}
39-
}' -f project=$PROJECT_ID -f issue=$node_id --jq '.data.addProjectV2ItemById.item.id')"
39+
}' -f project=$PROJECT_ID -f issue=$node_id --jq '.data.addProjectV2ItemById.item.id')"

0 commit comments

Comments
 (0)