Resolve conflicts and other small fixes #116
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VourMa
changed the base branch from
master
to
CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch9
VourMa
force-pushed
the
CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_conflictsAndSmallFixes
branch
from
e0255be to
0af031d
Compare
VourMa
changed the base branch from
CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch9
to
master
VourMa
changed the base branch from
master
to
CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch9
VourMa
changed the base branch from
CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch9
to
master
VourMa
changed the base branch from
master
to
CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch9
VourMa
changed the title
|
Closing this, as we will update to CMSSW_14_2_X_2024-11-06-1100 (see #118). I will create another PR to the batch9 branch with the remaining updates of this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With this PR I am dealing with:
I also tried to resolve the conflicts with the master branch in
Configuration/PyReleaseValidation/python/relval_Run4.py(formerConfiguration/PyReleaseValidation/python/relval_2026.py) but they remain no matter where I add the lines about LST. Fixing this would require merging the master, and this adds changes to hundreds of files (some of which are broken even in the master). As a result, I opted from removing workflows fromrunTheMatrix.py, given that we will in any case follow up with a PR to update the worfkflows shortly after merging the current PR.The actual instructions for the LST workflows are still in
Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py, as I managed to successfully resolve the conflicts there.We need to squash-merge this PR, I made many meaningless commits while experimenting with the conflicts.