Skip to content

[IMP] detect version from feature branches #96

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.

Sign up for GitHub

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

Open
hbrunn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[IMP] detect version from feature branches #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions oca_port/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,12 @@ def __post_init__(self):

def _handle_odoo_versions(self):
odoo_version_pattern = r"^[0-9]+\.[0-9]$"
source_version = re.search(odoo_version_pattern, self.source.branch)
target_version = re.search(odoo_version_pattern, self.target.branch)
source_version = re.search(
odoo_version_pattern, self.source.branch.split("-", 1)[0]
)
target_version = re.search(
odoo_version_pattern, self.target.branch.split("-", 1)[0]
)
source_param = "--source-version" if self.cli else "source_version"
target_param = "--target-version" if self.cli else "target_version"
# Check Odoo versions from branches
Expand Down
8 changes: 8 additions & 0 deletions oca_port/tests/test_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ def test_app_init(self):
self.assertFalse(app.destination.branch)
self.assertFalse(app.destination.branch)

# Check with a feature branch
# $ oca-port 15.0-feature 16.0 my_module
repo = self._git_repo(self.repo_path)
repo.remotes["origin"].fetch("15.0:15.0-feature")
app = self._create_app("15.0-feature", "16.0")
self.assertEqual(app.source_version, "15.0")
self.assertEqual(app.target_version, "16.0")

def test_check_addon_exists(self):
app = self._create_app(self.source1, self.target2)
# source
Expand Down
Loading