Skip to content

Commit

Permalink
fix CI and clang-tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
YanzhaoW committed Jan 8, 2024
1 parent bb405a4 commit c0bec7a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 16 deletions.
10 changes: 1 addition & 9 deletions .github/actions/pre-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,9 @@ runs:
echo "cacheSHA=$([[ ${{github.event_name}} = "push" ]] && git rev-parse --short HEAD || git rev-parse --short HEAD^)" >> $GITHUB_ENV
shell: bash

- name: conda setup
run: |
apt-get install -y ccache
source /root/.bashrc
conda list
# conda env create -f ${GITHUB_WORKSPACE}/python_environment.yml
# conda activate r3b-python-env
shell: bash

- name: mount cvmfs
run: |
apt-get install -y ccache
wget https://cernbox.cern.ch/remote.php/dav/public-files/RmnTeeOZpYjCJQb/masterkey.gsi.de.pub
mv masterkey.gsi.de.pub /etc/cvmfs/keys
cp .githubfiles/fairsoft.gsi.de.conf /etc/cvmfs/config.d
Expand Down
5 changes: 2 additions & 3 deletions .github/actions/r3bbuild-steps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ runs:
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
git clone https://github.com/R3BRootGroup/macros.git
echo "path environment variable: $PATH"
./build.py -p -c --cmake-extra-args="-DBUILD_GEOMETRY=OFF;-C cmake/CI_CD/configure_options.cmake"
# ./build_thisr3broot.sh -c -b build -e "-C cmake/CI_CD/configure_options.cmake"
echo "\npath environment variable: $PATH\n"
./build.py -p -c --cmake-extra-args="-DBUILD_GEOMETRY=OFF;-C $GITHUB_WORKSPACE/cmake/CI_CD/configure_options.cmake"
shell: bash

- name: build ${{ matrix.repos }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
id: restore-caching
uses: './.github/actions/install-deps'
with:
repo: 'false'
cache-name: 'false'

- name: configure r3broot
uses: './.github/actions/r3bbuild-steps'
Expand Down
1 change: 1 addition & 0 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ def cmake_configure(self):
cmake_args.append(f"-DCMAKE_BUILD_TYPE={self.args.build_type}")
extra_args = self.args.cmake_args.split(";")
cmake_args.extend(extra_args)
print(f"build.py: cmake {cmake_args}")
subprocess.run(["cmake"] + cmake_args, check=True)

def build_source(self):
Expand Down
4 changes: 2 additions & 2 deletions neuland/calibration/hitLevel/engine/R3BNeulandCosmicEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ namespace R3B::Neuland::Calibration

CosmicEngineInterface(const CosmicEngineInterface&) = default;
CosmicEngineInterface(CosmicEngineInterface&&) = delete;
CosmicEngineInterface& operator=(const CosmicEngineInterface&) = default;
CosmicEngineInterface& operator=(CosmicEngineInterface&&) = delete;
auto operator=(const CosmicEngineInterface&) -> CosmicEngineInterface& = default;
auto operator=(CosmicEngineInterface&&) -> CosmicEngineInterface& = delete;

void SetModuleSize(unsigned int module_size) { module_size_ = module_size; }
[[nodiscard]] auto GetModuleSize() const -> auto { return module_size_; }
Expand Down
1 change: 0 additions & 1 deletion neuland/calibration/legacy/R3BNeulandCal2HitPar.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ void R3BNeulandCal2HitPar::Exec(Option_t* option)
const auto pmt = static_cast<R3BNeulandCalData*>(fCalNeuland->At(i));

const auto id = pmt->GetBarId() - 1;
const auto plane = GetPlaneID(id);
const auto side = pmt->GetSide() - 1;

if (std::isnan(pmt->GetTriggerTime()))
Expand Down

0 comments on commit c0bec7a

Please sign in to comment.