diff --git a/.github/actions/pre-build/action.yml b/.github/actions/pre-build/action.yml index 537076fc0..90f13e0b0 100644 --- a/.github/actions/pre-build/action.yml +++ b/.github/actions/pre-build/action.yml @@ -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 diff --git a/.github/actions/r3bbuild-steps/action.yml b/.github/actions/r3bbuild-steps/action.yml index 340bac5b5..b73f365ae 100644 --- a/.github/actions/r3bbuild-steps/action.yml +++ b/.github/actions/r3bbuild-steps/action.yml @@ -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 }} diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index c0573a72b..428fa4594 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -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' diff --git a/build.py b/build.py index ddffd4b27..60b849f02 100755 --- a/build.py +++ b/build.py @@ -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): diff --git a/neuland/calibration/hitLevel/engine/R3BNeulandCosmicEngine.h b/neuland/calibration/hitLevel/engine/R3BNeulandCosmicEngine.h index 3c363e8c6..50683742d 100644 --- a/neuland/calibration/hitLevel/engine/R3BNeulandCosmicEngine.h +++ b/neuland/calibration/hitLevel/engine/R3BNeulandCosmicEngine.h @@ -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_; } diff --git a/neuland/calibration/legacy/R3BNeulandCal2HitPar.cxx b/neuland/calibration/legacy/R3BNeulandCal2HitPar.cxx index 55c0af898..370a22189 100644 --- a/neuland/calibration/legacy/R3BNeulandCal2HitPar.cxx +++ b/neuland/calibration/legacy/R3BNeulandCal2HitPar.cxx @@ -126,7 +126,6 @@ void R3BNeulandCal2HitPar::Exec(Option_t* option) const auto pmt = static_cast(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()))