Merge branch 'master' into DDbar_devel

Author: fcolamar

.github/workflows/code-formatting.yml

@@ -1,9 +1,10 @@
-name: Check PR with clang-format
+name: PR formatting
 
 on: [pull_request_target]
 
 jobs:
   clang-format:
+    name: clang-format
     # We need at least 20.04 to install clang-format-11.
     runs-on: ubuntu-20.04
 
@@ -99,3 +100,52 @@ jobs:
           true) echo 'PR clean' ; exit 0 ;;
           false) echo 'PR not clean' ; exit 1 ;;
         esac
+
+  copyright:
+    name: copyright headers
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        persist-credentials: false
+        # We need the history of the dev branch all the way back to where the PR
+        # diverged. We're fetching everything here, as we don't know how many
+        # commits back that point is.
+        fetch-depth: 0
+
+    - name: Check copyright headers
+      env:
+        # The expected copyright notice.
+        COPYRIGHT: |
+          // Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+          // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+          // All rights not expressly granted are reserved.
+          //
+          // This software is distributed under the terms of the GNU General Public
+          // License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+          //
+          // In applying this license CERN does not waive the privileges and immunities
+          // granted to it by virtue of its status as an Intergovernmental Organization
+          // or submit itself to any jurisdiction.
+      run: |
+        # Run copyright notice check
+        COPYRIGHT=$(printf '%s' "$COPYRIGHT")  # strip trailing newline
+        copyright_lines=$(echo "$COPYRIGHT" | wc -l)
+        base_commit=$(git merge-base HEAD ${{ github.event.pull_request.base.sha }})
+        have_err=
+        while read -r file; do
+          if [ "$(head -n "$copyright_lines" "$file")" != "$COPYRIGHT" ]; then
+            echo "::error::$file: missing or malformed copyright notice" >&2
+            have_err=1
+          fi
+        done < <(git diff --diff-filter d --name-only "$base_commit" -- '*.cxx' '*.h')
+
+        # Tell user what to do in case of copyright notice error
+        if [ -n "$have_err" ]; then
+          echo '::error::The files listed above are missing the correct copyright notice.' >&2
+          echo '::error::Make sure all your source files begin with the following exact lines:' >&2
+          echo "$COPYRIGHT" >&2
+          exit 1
+        fi

.github/workflows/codeowner-self-approval.yml

@@ -1,6 +1,7 @@
 name: PR self-approval
 
 on:
+  # We need pull_request_target so we can use ${{ secrets.* }}.
   pull_request_target:
     types:
       - auto_merge_enabled
@@ -9,91 +10,102 @@ jobs:
   approve:
     runs-on: ubuntu-latest
     # Only run if the PR author enabled auto-merge, not someone else.
-    if: github.event.sender.login == github.event.pull_request.user.login
+    # Also run if a new approval was created, as this affects whether we can
+    # auto-approve. There is a risk of infinite loops here, though -- when we
+    # submit our review, that'll trigger this workflow again, so only run if
+    # someone other than us (i.e. alibuild) reviewed.
+    if: >-
+      (github.event.action == 'auto_merge_enabled' &&
+       github.event.sender.login == github.event.pull_request.user.login)
 
     steps:
-      # Check out in order to get CODEOWNERS.
-      - uses: actions/checkout@v2
-        with:
-          # Always use the latest CODEOWNERS file, *not* the one from the PR!
-          ref: ${{ github.event.repository.default_branch }}
-          persist-credentials: false
-
       - name: Install dependencies
-        run: pip install PyGithub
-
-      # First, parse filename patterns in CODEOWNERS using git-check-ignore(1)
-      # to get the applicable code owners for this PR.
-      - name: Parse CODEOWNERS
-        id: owners
-        shell: bash -exo pipefail {0}
-        run: |
-          git config --global init.defaultBranch master  # avoid annoying warning
-          git init ../tmp  # temporary repo for .gitignore parsing
-          awk '!/^[[:space:]]*(#|$)/ {print $1}' CODEOWNERS > ../tmp/.gitignore
-          # Find changed files in PR and which CODEOWNERS entries match them.
-          curl -fsSL "${{ github.event.pull_request.diff_url }}" |
-            sed -rn 's,^diff --git a/(.*) b/(.*)$,\1\n\2,p' | uniq |
-            git -C ../tmp check-ignore -v --no-index --stdin |
-            cut -d: -f2 |
-            sed 's/$/p/' > extract-lines.sed
-          # Extract user names applicable to this PR. Same format as CODEOWNERS,
-          # but without the leading pattern, so we just have usernames separated
-          # by spaces and newlines.
-          echo "::set-output name=owners::$(
-            grep -vE '^[[:space:]]*(#|$)' CODEOWNERS |
-              sed -nf extract-lines.sed |
-              sed 's/^[^[:space:]]*[[:space:]]*//' |
-              tr '\n' ';'
-          )"
+        run: pip install codeowners PyGithub
 
-      # Finally, approve, if the author is only editing files owned by themselves.
-      - name: Check author is allowed to self-approve
+      # Approve the PR, if the author is only editing files owned by themselves.
+      - name: Auto-approve PR if permitted
         shell: python
         env:
-          submitter: ${{ github.event.sender.login }}
+          submitter: ${{ github.event.pull_request.user.login }}
           pr: ${{ github.event.pull_request.number }}
           repo: ${{ github.event.repository.full_name }}
-          owners: ${{ steps.owners.outputs.owners }}
           github_token: ${{ secrets.ALIBUILD_GITHUB_TOKEN }}
         run: |
-          import functools, github, os
+          import os
+          import sys
+          from functools import lru_cache
+          from codeowners import CodeOwners
+          from github import Github, UnknownObjectException
+
+          # Cache results of this function so we don't have to look up team
+          # membership multiple times.
+          @lru_cache(maxsize=None)
+          def matches_owner(owner):
+              '''Return whether the PR's submitter matches the given owner.
 
-          gh = github.Github(os.environ['github_token'])
-          submitter = os.environ['submitter']
+              owner is a (type, name) tuple, as returned by the CodeOwners.of
+              function. EMAIL owners cannot be handled currently, and will raise
+              a ValueError.
+              '''
+              owner_type, owner_name = owner
+              if owner_type == 'USERNAME':
+                  return owner_name.lstrip('@') == os.environ['submitter']
+              elif owner_type == 'TEAM':
+                  org, _, team_name = owner_name.lstrip('@').partition('/')
+                  try:
+                      gh.get_organization(org) \
+                        .get_team_by_slug(team_name) \
+                        .get_team_membership(os.environ['submitter'])
+                  except UnknownObjectException:
+                      return False   # submitter is not a member of this team
+                  return True
+              elif owner_type == 'EMAIL':
+                  # We can't resolve email addresses to GitHub usernames using
+                  # GitHub's API.
+                  raise ValueError('cannot handle email addresses in CODEOWNERS')
+              else:
+                  raise ValueError(f'unknown owner type {owner_type}')
 
-          @functools.lru_cache(maxsize=None)
-          def matches_owner(user_or_team):
-              user_or_team = user_or_team.lstrip('@')
-              org, is_team, team_name = user_or_team.partition('/')
-              if not is_team:
-                  return user_or_team == submitter
-              try:
-                  gh.get_organization(org) \
-                    .get_team_by_slug(team_name) \
-                    .get_team_membership(submitter)
-              except github.UnknownObjectException:
-                  return False
-              return True
+          gh = Github(os.environ['github_token'])
+          repo = gh.get_repo(os.environ['repo'])
+          pr = repo.get_pull(int(os.environ['pr']))
+          owners = CodeOwners(repo.get_contents('CODEOWNERS')
+                                  .decoded_content.decode('utf-8'))
+          approvals_from = {review.user.login for review in pr.get_reviews()
+                            if review.state == 'APPROVED'}
 
-          def check_lines():
-              auto_approve = True
-              # owners is a string containing semicolon-separated records of
-              # space-separated usernames. At least one username per record must
-              # match the submitter (taking teams into account), and all lines
-              # must have a matching username.
-              for line in os.environ['owners'].strip(';').split(';'):
-                  line_owners = line.split()
-                  assert all(o.startswith('@') for o in line_owners), \
-                      'failed to parse CODEOWNERS'
-                  if not any(map(matches_owner, line_owners)):
-                      print('::warning::Not auto-approving as you are not one of',
-                            ', '.join(line_owners))
-                      auto_approve = False
-              return auto_approve
+          # At least one username per CODEOWNERS line must match the submitter
+          # (taking teams into account), and all lines must have a matching
+          # username. If the PR author is not the codeowner for a file, then if
+          # a codeowner of that file approved this PR, we'll still auto-approve.
+          auto_approve = True
+          for filename in (f.filename for f in pr.get_files()):
+              file_owners, line = owners.matching_line(filename)
+              file_owners_names = {name.lstrip('@') for _, name in file_owners}
+              if approvals_from & file_owners_names:
+                  print(f'{filename}: OK: you have approval from the code'
+                        ' owners of this file, specifically:',
+                        ', '.join(approvals_from & file_owners_names),
+                        f' (CODEOWNERS line {line})', file=sys.stderr)
+              elif any(map(matches_owner, file_owners)):
+                  print(f'{filename}: OK: you are a code owner of this file'
+                        f' (CODEOWNERS line {line})', file=sys.stderr)
+              else:
+                  print('::warning::Not auto-approving as none of',
+                        ', '.join(file_owners_names),
+                        f'have approved this PR as owners of {filename}'
+                        f' (CODEOWNERS line {line})', file=sys.stderr)
+                  # Don't break out of the loop, so that we print every
+                  # non-matching CODEOWNERS rule for information.
+                  auto_approve = False
 
-          if check_lines():
-              gh.get_repo(os.environ['repo']) \
-                .get_pull(int(os.environ['pr'])) \
-                .create_review(event='APPROVE',
-                               body=f'Auto-approving on behalf of @{submitter}.')
+          if auto_approve:
+              print('Approving PR', file=sys.stderr)
+              pr.create_review(event='APPROVE', body=(
+                  f'Auto-approving on behalf of @{os.environ["submitter"]}.'
+              ))
+          else:
+              print('::warning::Not approving PR. You can see whose approval'
+                    ' you need in the messages above. This check will run again'
+                    " when the PR's author disables and reenables auto-merge.",
+                    file=sys.stderr)

.gitignore

@@ -2,4 +2,5 @@ CMakeCache.txt
 CMakeFiles/
 .vscode
 build
-compile_commands.json
+compile_commands.json
+.DS_Store

ALICE3/Core/TOFResoALICE3.h

@@ -39,7 +39,7 @@ class TOFResoALICE3 : public Parametrization
     }
 
     /** get info **/
-    const float time = x[1];
+    // const float time = x[1];
     const float evtimereso = x[2];
     const float mass = x[3];
     const float L = x[4];
@@ -59,7 +59,7 @@ class TOFResoALICE3 : public Parametrization
 float TOFResoALICE3Param(const float& momentum, const float& momentumError, const float& evtimereso, const float& length, const float& mass, const Parameters& parameters)
 {
   if (momentum <= 0) {
-    return -999;
+    return -999.f;
   }
 
   const float p2 = momentum * momentum;

ALICE3/TableProducer/alice3-centrality.cxx

@@ -27,7 +27,7 @@ struct ALICE3Centrality {
   Produces<aod::CentV0Ms> cent;
   Service<o2::ccdb::BasicCCDBManager> ccdb;
 
-  HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::QAObject};
+  HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
   Configurable<float> MinEta{"MinEta", -4.0f, "Minimum eta in range"};
   Configurable<float> MaxEta{"MaxEta", 4.0f, "Maximum eta in range"};
   Configurable<float> MaxMult{"MaxMult", 10000.f, "Maximum multiplicity in range"};