From d728b808832c081aca6bb6771e6206974cb75c60 Mon Sep 17 00:00:00 2001 From: Sabu Siyad Date: Sun, 10 Mar 2024 13:46:00 +0530 Subject: [PATCH 1/3] chore: remove proxy method: `setup_details_from_git_url` (#1546) --- bench/app.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/bench/app.py b/bench/app.py index 934a100b0..a4b3dc748 100755 --- a/bench/app.py +++ b/bench/app.py @@ -101,7 +101,7 @@ def setup_details(self): # fetch meta for repo from remote git server - traditional get-app url elif is_git_url(self.name): self.is_url = True - self._setup_details_from_git_url() + self.__setup_details_from_git() # fetch meta from new styled name tags & first party apps on github else: @@ -116,7 +116,7 @@ def _setup_details_from_mounted_disk(self): # If app is a git repo self.git_repo = git.Repo(self.mount_path) try: - self._setup_details_from_git_url(self.git_repo.remotes[0].url) + self.__setup_details_from_git(self.git_repo.remotes[0].url) if not (self.branch or self.tag): self.tag = self.branch = self.git_repo.active_branch.name except IndexError: @@ -131,9 +131,6 @@ def _setup_details_from_name_tag(self): self.org, self.repo, self.tag = fetch_details_from_tag(self.name, using_cached) self.tag = self.tag or self.branch - def _setup_details_from_git_url(self, url=None): - return self.__setup_details_from_git(url) - def __setup_details_from_git(self, url=None): name = url if url else self.name if name.startswith("git@") or name.startswith("ssh://"): From 5a0922d9918ecf37fb5bede93f5921d45f3334cb Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Mon, 15 Apr 2024 17:05:15 +0200 Subject: [PATCH 2/3] fix: add jammy package for Ubuntu 22 (#1549) --- bench/playbooks/roles/wkhtmltopdf/tasks/main.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bench/playbooks/roles/wkhtmltopdf/tasks/main.yml b/bench/playbooks/roles/wkhtmltopdf/tasks/main.yml index 2a6a89eaf..c87694c9e 100644 --- a/bench/playbooks/roles/wkhtmltopdf/tasks/main.yml +++ b/bench/playbooks/roles/wkhtmltopdf/tasks/main.yml @@ -20,6 +20,19 @@ force: yes when: ansible_os_family == 'Debian' +- name: download wkthmltox Ubuntu 22 + get_url: + url: https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.jammy_amd64.deb + dest: /tmp/wkhtmltox.deb + when: ansible_distribution == 'Ubuntu' and ansible_distribution_major_version == '22' and ansible_architecture != 'aarch64' + +- name: download wkthmltox Ubuntu 22 arm64 + get_url: + # wkhtmltox supports arm64 starting from 0.12.6 + url: https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.jammy_arm64.deb + dest: /tmp/wkhtmltox.deb + when: ansible_distribution == 'Ubuntu' and ansible_distribution_major_version == '22' and ansible_architecture == 'aarch64' + - name: download wkthmltox Ubuntu 20 get_url: url: https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.focal_amd64.deb From 1751b2db5bcedc33276026f3283a4ff1f0d5ac04 Mon Sep 17 00:00:00 2001 From: Fritz Date: Mon, 29 Apr 2024 12:52:19 +0200 Subject: [PATCH 3/3] fix: Switched to native GIT way to lookup branch names (#1553) --- bench/utils/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bench/utils/app.py b/bench/utils/app.py index 5d3ec6f43..07b8edc7e 100644 --- a/bench/utils/app.py +++ b/bench/utils/app.py @@ -172,7 +172,7 @@ def get_current_branch(app, bench_path="."): from bench.utils import get_cmd_output repo_dir = get_repo_dir(app, bench_path=bench_path) - return get_cmd_output("basename $(git symbolic-ref -q HEAD)", cwd=repo_dir) + return get_cmd_output("git symbolic-ref -q --short HEAD", cwd=repo_dir) @lru_cache(maxsize=5)