Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SL19e backports #15

Open
wants to merge 9 commits into
base: SL19e
Choose a base branch
from
Open

SL19e backports #15

wants to merge 9 commits into from

Commits on Nov 18, 2021

  1. Keep only one of the two identical files 

    OnlTools/OnlinePlots/icons/FileOpen.xpm
OnlTools/OnlinePlots/icons/fileopen.xpm

OnlTools/OnlinePlots/images/FileOpen.xpm
OnlTools/OnlinePlots/images/fileopen.xpm
    @plexoos
    plexoos committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    cafad41 View commit details
    Browse the repository at this point in the history

  2. Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (star-bnl#195) 

    This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h

Removing it resolves star-bnl#194. For details see star-bnl#194
    @plexoos
    plexoos committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    1c5ce35 View commit details
    Browse the repository at this point in the history

  3. Rename files to avoid conflict on case insensitive filesystems 

    StRoot/StMCFilter/StGENParticle.h
StRoot/StMCFilter/StGENParticle.cxx

conflict with

StRoot/StMCFilter/StGenParticle.h
StRoot/StMCFilter/StGenParticle.cxx
    @plexoos
    plexoos committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    69ce6bb View commit details
    Browse the repository at this point in the history

  4. Rename class s/StarLight/StarLightGen/ and file 

    StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx
StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h
    @plexoos
    plexoos committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    8db388f View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2021

  1. Move pams/gen/idl from star-mcgen repo to star-sw

    @plexoos
    plexoos committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    919869c View commit details
    Browse the repository at this point in the history

  2. Rename class s/StGENParticle/StGimParticle/

    @plexoos
    plexoos committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    7bfb7e7 View commit details
    Browse the repository at this point in the history

  3. Backport CI machinery from main branch 

    This is done by simply checking out the corresponding files:

git checkout aed3dcc -- .github/workflows docker/Dockerfile.root5 tests/ StRoot/macros/rootlogoff.C StRoot/macros/rootlogon.C StRoot/macros/.rootrc
git checkout SL21c_5 -- mgr/ConsDefs.pm
    @plexoos
    plexoos committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    2ceb5d7 View commit details
    Browse the repository at this point in the history

  4. Remove ROOT6 build from CI jobs

    @plexoos
    plexoos committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    5d1c5bb View commit details
    Browse the repository at this point in the history

  5. Exclude unsupported packages from the build

    @plexoos
    plexoos committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    cc96610 View commit details
    Browse the repository at this point in the history