From 85ff6792f8beca0288ffb5a79faec8f0b7a704de Mon Sep 17 00:00:00 2001 From: Anoop Kurungadam Date: Sun, 20 Oct 2024 20:48:45 +0530 Subject: [PATCH 1/2] fix(ci): indentation --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e7d724235..f9670ba064 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,8 +31,8 @@ jobs: strategy: fail-fast: false - matrix: - container: [1] + matrix: + container: [1] name: Server Tests From 02ae011df9138fb79827df398298b31149dea41e Mon Sep 17 00:00:00 2001 From: Anoop Kurungadam Date: Sun, 20 Oct 2024 21:15:53 +0530 Subject: [PATCH 2/2] fix(ci): initialize branchtoclone --- .github/helper/install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 49a3ace1b7..0d434cd088 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -10,7 +10,9 @@ sudo apt install libcups2-dev redis-server mariadb-client-10.6 pip install frappe-bench -git clone https://github.com/frappe/frappe --branch "$BRANCH_TO_CLONE" --depth 1 +branchtoclone=${GITHUB_BASE_REF:-${GITHUB_REF##*/}} + +git clone https://github.com/frappe/frappe --branch "${branchtoclone}" --depth 1 bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench mkdir ~/frappe-bench/sites/test_site @@ -41,7 +43,7 @@ sed -i 's/socketio:/# socketio:/g' Procfile sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile bench get-app payments -bench get-app https://github.com/frappe/erpnext --branch "$BRANCH_TO_CLONE" +bench get-app https://github.com/frappe/erpnext --branch "${branchtoclone}" bench get-app healthcare "${GITHUB_WORKSPACE}" bench setup requirements --dev