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.

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

Reorganizing projects directory #247

Merged
merged 19 commits into from
Jun 15, 2022
Merged

Reorganizing projects directory #247

merged 19 commits into from
Jun 15, 2022

Conversation

jgalan
Copy link
Member

@jgalan jgalan commented Jun 13, 2022

jgalan Ok: 30

This PR intention is to reorganize the projects directory. Now a main project directory is linked to the framework, while the project may contain additional submodules, or structure.

The following projects are linked :

  • detector-template: A set of project template repositories that can be used as reference to create new projects. Hosted at GitHub/rest-for-physics.
  • basic-examples: A collection of examples for each of the specific domains, readouts, geometries, simulations, etc. Hosted at rest-for-physics.
  • alphacamm: Hosted at LFNA. https://lfna.unizar.es/gifna/alphacamm
  • trexdm: Hosted at LFNA. https://lfna.unizar.es/gifna/trexdm-project
  • iaxo : Hosted at GitHub/iaxo.

@jgalan jgalan requested a review from juanangp June 13, 2022 16:28
@jgalan
Copy link
Member Author

jgalan commented Jun 13, 2022

The pipeline fails with CheckFileIsAccessible. By the name I would say that method does something similar to FileExists.

@jgalan jgalan force-pushed the jgalan_projects branch from 76d2f08 to 91bf7ad Compare June 13, 2022 17:33
@@ -75,7 +75,7 @@ Validate Code:
stage: pre-build
script:
- cd ${CI_PROJECT_DIR}/
- python3 pull-submodules.py --force --dontask --latest:${CI_COMMIT_BRANCH}
- python3 pull-submodules.py --force --dontask --latest:${CI_COMMIT_BRANCH} --exclude:iaxo,detector-template
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't be included inside lfna?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Include what inside lfna?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lfna projects are optional, they will be pulled only if we add the option --lfna

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we do not need them for the pipelines, we better do not pull them

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, these are not under lfna, what I meant is if would be a good idea to add projects option to pull-submodules.py following the new projects structure.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if I got exactly what you want

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something like

- python3 pull-submodules.py --force --dontask --latest:${CI_COMMIT_BRANCH} --projects

Otherwise the projects are excluded by default, or the other way around

@juanangp
Copy link
Member

Can you post in the PR description the link to the different projects? It is a bit difficult to follow up, particularly the ones under lfna.

@jgalan
Copy link
Member Author

jgalan commented Jun 13, 2022

Can you post in the PR description the link to the different projects? It is a bit difficult to follow up, particularly the ones under lfna.

In principle if you got directly to the branch https://github.com/rest-for-physics/framework/tree/jgalan_projects

you may check projects directory and .gitmodules file.

@lobis lobis self-requested a review June 13, 2022 19:31
@juanangp
Copy link
Member

Can you merge master in this branch, at least to see if build passes. Pipeline currently has other issues that I am afraid should be addressed somewhere else.

@jgalan jgalan merged commit 6ad431a into master Jun 15, 2022
@jgalan
Copy link
Member Author

jgalan commented Jun 15, 2022

Wow I merged! And GitHub Pipeline was red!

@juanangp
Copy link
Member

Wow I merged! And GitHub Pipeline was red!

Well, we have to configure the master branch settings to block PR in case that the pipeline fails. It is not yet configured. We should define the checks that are required and we can force the merge with master.

@jgalan
Copy link
Member Author

jgalan commented Jun 15, 2022

Aham, but the other day I had the impression the PR was blocked by the checks.

@jgalan jgalan deleted the jgalan_projects branch June 15, 2022 09:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants