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

Use branch of same name in ScopeSim and Templates if exists #210

Merged
merged 2 commits into from
Feb 22, 2025

Conversation

teutoburg
Copy link
Contributor

@teutoburg teutoburg commented Feb 17, 2025

This would avoid situations like we have in #205 (well, this wouldn't fix that one in particular, because the branch names don't match, but if they did, it would). The reverse operation (cloning the right IRDB branch into ScopeSim) needs to be done a bit differently, but this is a beginning.

For reference, I took inspiration for this from https://github.com/hse-project/hse/blob/6d5207f88044a3bd9b3539260074395317e276d5/.github/workflows/builds.yaml#L120-L148.

@teutoburg teutoburg added the irdb functionality Publish script, packaging, badges etc. label Feb 17, 2025
@teutoburg teutoburg self-assigned this Feb 17, 2025
@teutoburg teutoburg force-pushed the fh/sisterbranches branch 3 times, most recently from ce95b18 to b20379b Compare February 17, 2025 18:15
@teutoburg
Copy link
Contributor Author

Only took three attempts 💪

@teutoburg teutoburg marked this pull request as ready for review February 17, 2025 19:51
@teutoburg teutoburg requested a review from hugobuddel February 17, 2025 19:51
Copy link
Collaborator

@hugobuddel hugobuddel left a comment

Choose a reason for hiding this comment

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

Great, thanks.

This seems much harder in github than in gitlab.

This is my 'solution' to align METIS_Pipeline and METIS_Pipeline_Test_Data AstarVienna/METIS_Pipeline#104

@teutoburg
Copy link
Contributor Author

This is my 'solution' to align METIS_Pipeline and METIS_Pipeline_Test_Data AstarVienna/METIS_Pipeline#104

Yes, I saw that and took inspiration from it, but couldn't make that work with the pip install from git in the case of no matching branch. Perhaps it can be done though. For the reverse operation (IRDB inside Scopesim tests), that solution will work, because it's a straightup clone (e.g. the notebook tests), and I'm planning to use that there.

@teutoburg teutoburg merged commit 051357d into dev_master Feb 22, 2025
7 checks passed
@teutoburg teutoburg deleted the fh/sisterbranches branch February 22, 2025 11:42
@teutoburg
Copy link
Contributor Author

Aha, gotcha: https://github.com/AstarVienna/irdb/actions/runs/13472564113/job/37647845619

When triggered by anything other than a PR (e.g. a push), the branch checking step is skipped (which was intentional, as this only has relevance for PRs). However, this means that the branch name is never set to the default (main), so the pip install in the next step fails. I'll fix it by moving the line that sets the default in a separate step before, that's always executed...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
irdb functionality Publish script, packaging, badges etc.
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

2 participants