Skip to content

Commit 9d18583

Browse files
authored
Merge branch 'AliceO2Group:master' into master
2 parents 360c8c2 + 661e4ba commit 9d18583

File tree

292 files changed

+20190
-10805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

292 files changed

+20190
-10805
lines changed

.checkov.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
# You can see all available properties here: https://github.com/bridgecrewio/checkov#configuration-using-a-config-file
3+
quiet: true
4+
skip-check:
5+
- CKV_DOCKER_2
6+
- CKV_GHA_7

.github/workflows/clean-test.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
name: Clean PR checks
3+
4+
'on':
5+
workflow_dispatch:
6+
inputs:
7+
pr:
8+
description: PR number in this repo to be cleaned
9+
type: string # can't use number here
10+
required: true
11+
message:
12+
description: Human-readable message displayed on the new pending status
13+
type: string
14+
required: false
15+
default: ''
16+
17+
# Warning: GitHub limits the total number of inputs to 10, so a maximum of
18+
# 8 checks is allowed here!
19+
# Warning: the check_* keys are magic and must consist of the string
20+
# "check_" followed by the applicable check name exactly. The
21+
# "description" field is only the human-readable label for the input.
22+
'check_build/O2Physics/o2/macOS-arm':
23+
description: build/O2Physics/o2/macOS-arm
24+
type: boolean
25+
default: true
26+
27+
'check_build/O2Physics/o2/macOS':
28+
description: build/O2Physics/o2/macOS
29+
type: boolean
30+
default: true
31+
32+
'check_build/O2Physics/o2':
33+
description: build/O2Physics/o2
34+
type: boolean
35+
default: true
36+
37+
permissions: {}
38+
39+
jobs:
40+
clean:
41+
name: Clean PR checks
42+
uses: alisw/ali-bot/.github/workflows/clean-pr-checks.yml@master
43+
with:
44+
owner: ${{ github.event.repository.owner.login }}
45+
repo: ${{ github.event.repository.name }}
46+
pr: ${{ github.event.inputs.pr }}
47+
message: ${{ github.event.inputs.message }}
48+
checks: ${{ toJSON(github.event.inputs) }}
49+
permissions:
50+
pull-requests: read # to get last commit for pr (octokit/graphql-action)
51+
statuses: write # for set-github-status

.github/workflows/labeler.yml

Lines changed: 109 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
name: "Pull Request Labeler"
3-
on:
4-
- pull_request_target
3+
'on':
4+
pull_request_target:
5+
types: [opened, synchronize, reopened, edited]
56
permissions: read-all
67

78
jobs:
@@ -10,7 +11,112 @@ jobs:
1011
permissions:
1112
contents: read
1213
pull-requests: write
14+
outputs:
15+
labels: ${{ steps.labeler.outputs.all-labels }}
1316
steps:
14-
- uses: actions/labeler@v5
17+
- name: Label the PR
18+
id: labeler
19+
uses: actions/labeler@v5
1520
with:
1621
repo-token: ${{ secrets.GITHUB_TOKEN }}
22+
sync-labels: true
23+
title-prefix-checker:
24+
runs-on: ubuntu-latest
25+
permissions:
26+
contents: read
27+
pull-requests: write
28+
needs: labeler
29+
steps:
30+
- name: Check the PR title prefix
31+
id: check-prefix
32+
env:
33+
title: ${{ github.event.pull_request.title }}
34+
labels: ${{ needs.labeler.outputs.labels }}
35+
shell: python
36+
run: |
37+
import os
38+
import re
39+
import sys
40+
title = os.environ['title']
41+
labels = os.environ['labels']
42+
tags = {
43+
"infrastructure": "Infrastructure",
44+
"common": "Common",
45+
"alice3": "ALICE3",
46+
"pwgcf": "PWGCF",
47+
"pwgdq": "PWGDQ",
48+
"pwgem": "PWGEM",
49+
"pwghf": "PWGHF",
50+
"pwgje": "PWGJE",
51+
"pwglf": "PWGLF",
52+
"pwgud": "PWGUD",
53+
"dpg": "DPG",
54+
"trigger": "Trigger",
55+
"tutorial": "Tutorial",
56+
}
57+
print(f'PR title: "{title}"')
58+
print(f'PR labels: "{labels}"')
59+
tags_relevant = [tags[label] for label in tags if label in labels.split(",")]
60+
print("Relevant title tags:", ",".join(tags_relevant))
61+
passed = True
62+
prefix_good = ",".join(tags_relevant)
63+
prefix_good = f"[{prefix_good}] "
64+
print(f"Generated prefix: {prefix_good}")
65+
replace_title = 0
66+
title_new = title
67+
# If there is a prefix which contains a known tag, check it for correct tags, and reformat it if needed.
68+
# If there is a prefix which does not contain any known tag, add the tag prefix.
69+
# If there is no prefix, add the tag prefix.
70+
if match := re.match(r"\[?(\w[\w, /\+-]+)[\]:]+ ", title):
71+
prefix_title = match.group(1)
72+
words_prefix_title = prefix_title.replace(",", " ").replace("/", " ").split()
73+
title_stripped = title[len(match.group()) :]
74+
print(f'PR title prefix: "{prefix_title}" -> tags: {words_prefix_title}')
75+
print(f'Stripped PR title: "{title_stripped}"')
76+
if any(tag in words_prefix_title for tag in tags.values()):
77+
for tag in tags.values():
78+
if tag in tags_relevant and tag not in words_prefix_title:
79+
print(f'::error::Relevant tag "{tag}" not found in the prefix of the PR title.')
80+
passed = False
81+
if tag not in tags_relevant and tag in words_prefix_title:
82+
print(f'::error::Irrelevant tag "{tag}" found in the prefix of the PR title.')
83+
passed = False
84+
# Format a valid prefix.
85+
if passed:
86+
prefix_good = ",".join(w for w in prefix_title.replace(",", " ").split() if w)
87+
prefix_good = f"[{prefix_good}] "
88+
print(f"::notice::Reformatted prefix: {prefix_good}")
89+
if match.group() != prefix_good:
90+
replace_title = 1
91+
title_new = prefix_good + title_stripped
92+
else:
93+
print("::warning::No known tags found in the prefix.")
94+
if tags_relevant:
95+
replace_title = 1
96+
title_new = prefix_good + title
97+
else:
98+
print("::warning::No valid prefix found in the PR title.")
99+
if tags_relevant:
100+
replace_title = 1
101+
title_new = prefix_good + title
102+
if not passed:
103+
print("::error::Problems were found in the PR title prefix.")
104+
print('::notice::Use the form "tags: title" or "[tags] title".')
105+
sys.exit(1)
106+
if replace_title:
107+
print("::warning::The PR title prefix with tags needs to be added or adjusted.")
108+
print(f'::warning::New title: "{title_new}".')
109+
else:
110+
print("::notice::The PR title prefix is fine.")
111+
with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as fh:
112+
print(f"replace={replace_title}", file=fh)
113+
print(f"title={title_new}", file=fh)
114+
- name: Fix the PR title prefix
115+
if: ${{ steps.check-prefix.outputs.replace == 1 }}
116+
uses: the-wright-jamie/[email protected]
117+
with:
118+
repo-token: "${{ secrets.GITHUB_TOKEN }}"
119+
base-branch-regex: master
120+
error-on-fail: false
121+
title-template: "${{ steps.check-prefix.outputs.title }}"
122+
title-update-action: replace

.github/workflows/mega-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
id: ml
3939
# You can override MegaLinter flavor used to have faster performances
4040
# More info at https://megalinter.io/flavors/
41-
uses: oxsecurity/megalinter@v8
41+
uses: oxsecurity/megalinter@v8.1.0
4242
env:
4343
# All available variables are described in documentation:
4444
# https://megalinter.io/configuration/

CODEOWNERS

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,33 @@
2727
/EventFiltering/PWGCF @alibuild @lauraser @mpuccio @lietava
2828
/EventFiltering/PWGMM @alibuild @aortizve @mpuccio @lietava
2929
/EventFiltering/PWGJE @alibuild @fkrizek @nzardosh @mpuccio @lietava
30-
/PWGCF @alibuild @saganatt @victor-gonzalez @zchochul
31-
/PWGCF/Core @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
32-
/PWGCF/DataModel @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
33-
/PWGCF/TableProducer @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
34-
/PWGCF/Tasks @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
30+
/PWGCF @alibuild @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
31+
/PWGCF/Core @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
32+
/PWGCF/DataModel @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
33+
/PWGCF/TableProducer @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
34+
/PWGCF/Tasks @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
3535
/PWGDQ @alibuild @iarsene @dsekihat @feisenhu @lucamicheletti93
3636
/PWGEM @alibuild @mikesas @rbailhac @feisenhu
3737
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
3838
/PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat
3939
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano
40-
/PWGLF @alibuild @ercolessi @fmazzasc @chiarapinto @maciacco @BongHwi @smaff92 @ChiaraDeMartin95 @njacazio @skundu692
41-
/PWGMM @alibuild @aalkin @njacazio @skundu692
40+
# PWG-LF
41+
/PWGLF @alibuild @njacazio @skundu692
42+
/PWGLF/Tasks/GlobalEventProperties @alibuild @njacazio @skundu692 @gbencedi @omvazque
43+
/PWGLF/TableProducer/GlobalEventProperties @alibuild @njacazio @skundu692 @gbencedi @omvazque
44+
/PWGLF/Tasks/Nuspex @alibuild @njacazio @skundu692 @fmazzasc @chiarapinto @maciacco
45+
/PWGLF/TableProducer/Nuspex @alibuild @njacazio @skundu692 @fmazzasc @chiarapinto @maciacco
46+
/PWGLF/Tasks/Resonances @alibuild @njacazio @skundu692 @BongHwi @smaff92
47+
/PWGLF/TableProducer/Resonances @alibuild @njacazio @skundu692 @BongHwi @smaff92
48+
/PWGLF/Tasks/Strangeness @alibuild @njacazio @skundu692 @ercolessi @ChiaraDeMartin95
49+
/PWGLF/TableProducer/Strangeness @alibuild @njacazio @skundu692 @ercolessi @ChiaraDeMartin95
50+
51+
# PWG-MM
52+
/PWGMM @alibuild @njacazio @skundu692 @aalkin
53+
/PWGMM/Mult @alibuild @njacazio @skundu692 @aalkin @aortizve @ddobrigk
4254
/PWGMM/Lumi @alibuild @aalkin
43-
/PWGMM/Mult @alibuild @aalkin @aortizve @ddobrigk
44-
/PWGMM/UE @alibuild @aalkin @aortizve
55+
/PWGMM/UE @alibuild @aalkin @aortizve
56+
4557
/PWGUD @alibuild @pbuehler @abylinkin @rolavick
4658
/PWGJE @alibuild @lhavener @maoyx @nzardosh @ddobrigk @mfasDa
4759
/Tools/PIDML @alibuild @saganatt
@@ -50,7 +62,7 @@
5062
/Tutorials/PWGDQ @alibuild @iarsene @dsekihat @feisenhu @lucamicheletti93
5163
/Tutorials/PWGEM @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
5264
/Tutorials/PWGHF @alibuild @vkucera @fcolamar @fgrosa
53-
/Tutorials/PWGJE @alibuild @lhavener @maoyx @nzardosh @ddobrigk @mfasDa
65+
/Tutorials/PWGJE @alibuild @lhavener @maoyx @nzardosh @mfasDa @fjonasALICE
5466
/Tutorials/PWGLF @alibuild @alcaliva @lbariogl @chiarapinto @BongHwi @lbarnby @mbombara @iravasen @njacazio @ChiaraDeMartin95 @skundu692
5567
/Tutorials/PWGMM @alibuild @aalkin @ddobrigk
5668
/Tutorials/PWGUD @alibuild @pbuehler

CPPLINT.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
filter=-build/c++11,-build/namespaces,-readability/fn_size,-readability/todo,-runtime/references,-whitespace/blank_line,-whitespace/braces,-whitespace/comments,-whitespace/line_length,-whitespace/semicolon,-whitespace/todo
1+
filter=-build/c++11,-build/namespaces,-readability/fn_size,-readability/todo,-runtime/references,-whitespace/blank_line,-whitespace/braces,-whitespace/comments,-whitespace/indent_namespace,-whitespace/line_length,-whitespace/semicolon,-whitespace/todo

Common/CCDB/EventSelectionParams.cxx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,12 @@ const char* selectionLabels[kNsel] = {
5555
"kIsVertexITSTPC",
5656
"kIsVertexTOFmatched",
5757
"kIsVertexTRDmatched",
58-
"kNoHighOccupancyAgressive",
59-
"kNoHighOccupancyStrict",
60-
"kNoHighOccupancyMedium",
61-
"kNoHighOccupancyRelaxed",
62-
"kNoHighOccupancyGentle",
58+
"kNoCollInTimeRangeNarrow",
59+
"kNoCollInTimeRangeStrict",
6360
"kNoCollInTimeRangeStandard",
64-
"kNoCollInTimeRangeNarrow"};
61+
"kNoCollInTimeRangeVzDependent",
62+
"kNoCollInRofStrict",
63+
"kNoCollInRofStandard"};
6564
} // namespace o2::aod::evsel
6665

6766
using namespace o2::aod::evsel;

0 commit comments

Comments
 (0)