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 of Icepack as a submodule #58

Merged
merged 2 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/jedi_bundle/config/bundles/build-order.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@


# Soca
- icepack:
repo_url_name: Icepack
default_branch: feature/ecbuild-new
- soca:
default_branch: develop

Expand Down
1 change: 0 additions & 1 deletion src/jedi_bundle/config/bundles/soca.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
optional_repos:
- crtm
- icepack

required_repos:
- jedicmake
Expand Down
3 changes: 0 additions & 3 deletions src/jedi_bundle/config/pinned_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,3 @@
- ufo-data:
branch: 1a3008b44adbbe50926dd7915fdbb975233084d9
commit: true
- icepack:
branch: 73136ee8dcdbe378821e540488a5980a03d8abe6
commit: true
3 changes: 1 addition & 2 deletions src/jedi_bundle/utils/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ def get_url_and_branch(logger, github_orgs, repo_url_name, default_branch,
# Check for user branch and return right away if found
if user_branch != '':
if repo_has_branch(logger, github_url, user_branch):
is_tag = False
return repo_url_found, github_url, user_branch, is_tag
return repo_url_found, github_url, user_branch, is_tag, is_commit

# Track first instance of finding the default branch. But do not exit when it's first
# found so that other organizations can be checked for the user branch.
Expand Down
Loading