From 0fb1a7264bd37d4a60ed1bd804a25e08377ff66e Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Tue, 25 Jun 2024 14:01:43 +0530 Subject: [PATCH 1/3] fix: dynamic branch name in ci boilerplate --- frappe/utils/boilerplate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index 56accfb7e0..1c8b68eff7 100644 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -624,11 +624,11 @@ name: CI on: push: branches: - - develop + - {branch_name} pull_request: concurrency: - group: develop-{app_name}-${{{{ github.event.number }}}} + group: {branch_name}-{app_name}-${{{{ github.event.number }}}} cancel-in-progress: true jobs: From 458fce7b1e58c787303d377cab6cb7799777c889 Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Tue, 25 Jun 2024 14:02:45 +0530 Subject: [PATCH 2/3] fix: update apt before mariadb client install in ci boilerplate --- frappe/utils/boilerplate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index 1c8b68eff7..66991c249d 100644 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -697,7 +697,9 @@ jobs: ${{{{ runner.os }}}}-yarn- - name: Install MariaDB Client - run: sudo apt-get install mariadb-client-10.6 + run: | + sudo apt update + sudo apt-get install mariadb-client-10.6 - name: Setup run: | From 69b2560cb7b7404503094ee74d8d0fd78c812398 Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Tue, 25 Jun 2024 14:05:44 +0530 Subject: [PATCH 3/3] fix: indentation --- frappe/utils/boilerplate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index 66991c249d..dd9dc0134e 100644 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -699,7 +699,7 @@ jobs: - name: Install MariaDB Client run: | sudo apt update - sudo apt-get install mariadb-client-10.6 + sudo apt-get install mariadb-client-10.6 - name: Setup run: |