From 9986e8c0dfd384b2f422a2cfc1ace5decef0af48 Mon Sep 17 00:00:00 2001 From: dooruk Date: Thu, 16 Jan 2025 11:10:09 -0500 Subject: [PATCH 1/2] fix user_branch return --- src/jedi_bundle/utils/git.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/jedi_bundle/utils/git.py b/src/jedi_bundle/utils/git.py index 4f4a6e7..a828925 100644 --- a/src/jedi_bundle/utils/git.py +++ b/src/jedi_bundle/utils/git.py @@ -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. From 48bdf5983f879d1b6d26e6567b48731d0069b90f Mon Sep 17 00:00:00 2001 From: dooruk Date: Thu, 16 Jan 2025 11:16:36 -0500 Subject: [PATCH 2/2] icepack as submodule --- src/jedi_bundle/config/bundles/build-order.yaml | 3 --- src/jedi_bundle/config/bundles/soca.yaml | 1 - src/jedi_bundle/config/pinned_versions.yaml | 3 --- 3 files changed, 7 deletions(-) diff --git a/src/jedi_bundle/config/bundles/build-order.yaml b/src/jedi_bundle/config/bundles/build-order.yaml index 1cede3f..c75607b 100644 --- a/src/jedi_bundle/config/bundles/build-order.yaml +++ b/src/jedi_bundle/config/bundles/build-order.yaml @@ -51,9 +51,6 @@ # Soca -- icepack: - repo_url_name: Icepack - default_branch: feature/ecbuild-new - soca: default_branch: develop diff --git a/src/jedi_bundle/config/bundles/soca.yaml b/src/jedi_bundle/config/bundles/soca.yaml index 53452c8..d04af78 100644 --- a/src/jedi_bundle/config/bundles/soca.yaml +++ b/src/jedi_bundle/config/bundles/soca.yaml @@ -1,6 +1,5 @@ optional_repos: - crtm - - icepack required_repos: - jedicmake diff --git a/src/jedi_bundle/config/pinned_versions.yaml b/src/jedi_bundle/config/pinned_versions.yaml index 40d0175..756f3ef 100644 --- a/src/jedi_bundle/config/pinned_versions.yaml +++ b/src/jedi_bundle/config/pinned_versions.yaml @@ -47,6 +47,3 @@ - ufo-data: branch: 1a3008b44adbbe50926dd7915fdbb975233084d9 commit: true -- icepack: - branch: 73136ee8dcdbe378821e540488a5980a03d8abe6 - commit: true